From f0cd00790c686bb4e14a1e608614a03bfda0578f Mon Sep 17 00:00:00 2001 From: Ivan Zakharyaschev Date: Thu, 16 Jan 2014 15:49:35 +0400 Subject: [PATCH] restore: Implemented with rebase and reset. (Do not forget to reset manually in case of conflicts!) --- gitgitconfig-restore | 1 + 1 file changed, 1 insertion(+) diff --git a/gitgitconfig-restore b/gitgitconfig-restore index 0269614..1956ce6 100755 --- a/gitgitconfig-restore +++ b/gitgitconfig-restore @@ -41,6 +41,7 @@ fi # Like git stash --include-untracked: git add -A . git commit --allow-empty -m 'Automatically saving your local modifications to the config (for "stashing").' +echo $"Afterwards, do not forget to: " 'git reset --mixed HEAD^' # Pulling from GITCONFIG/master in origin: # (We have set up such behavior in our gitgitconfig-init.) -- 2.11.4.GIT