projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 80ff479) | patch
rebase -m: remember allow_rerere_autoupdate option
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Sun, 6 Feb 2011 18:43:56 +0000 (13:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 22:08:09 +0000 (14:08 -0800)
commitb3e4847e50cf0ab3da4ad9664a5e4382e778ebd5
treefef22310012dc596dae3483aece059edffa90590tree | snapshot
parent80ff47957b3a8ae057178a7b1113d171404e938fcommit | diff
rebase -m: remember allow_rerere_autoupdate option

If '--[no-]allow_rerere_autoupdate' is passed when 'git rebase -m' is
called and a merge conflict occurs, the flag will be forgotten for the
rest of the rebase process. Make rebase remember it by saving the
value.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase.sh diff | blob | history
t/t3418-rebase-continue.sh diff | blob | history
Git—the stupid content tracker