Ramkumar Ramachandra artag...@gmail.com writes:
+ elif test $autostash = false
+ then
require_clean_work_tree pull with rebase Please commit or
stash them.
fi
A safety net, after you run git stash, to validate that the
added git stash indeed made the working
Junio C Hamano wrote:
Ramkumar Ramachandra artag...@gmail.com writes:
+ elif test $autostash = false
+ then
require_clean_work_tree pull with rebase Please commit or
stash them.
fi
A safety net, after you run git stash, to validate that the
added git stash
Ramkumar Ramachandra wrote:
Junio C Hamano wrote:
Ramkumar Ramachandra artag...@gmail.com writes:
+ elif test $autostash = false
+ then
require_clean_work_tree pull with rebase Please commit
or stash them.
fi
A safety net, after you run git stash, to validate
Junio C Hamano wrote:
Ramkumar Ramachandra artag...@gmail.com writes:
@@ -1786,6 +1786,11 @@ pull.rebase::
of merging the default branch from the default remote when git
pull is run. See branch.name.rebase for setting this on a
per-branch basis.
+
+pull.autostash::
+
This new configuration variable executes 'git stash' before attempting
to merge/rebase, and 'git stash pop' after a successful merge/rebase.
It makes it convenient for people to pull with dirty worktrees.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/config.txt | 5
Ramkumar Ramachandra artag...@gmail.com writes:
@@ -1786,6 +1786,11 @@ pull.rebase::
of merging the default branch from the default remote when git
pull is run. See branch.name.rebase for setting this on a
per-branch basis.
+
+pull.autostash::
+ When true,
6 matches
Mail list logo
