![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Tue, 28 Dec 2010 09:30:44 +0000 (10:30 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Dec 2010 23:05:37 +0000 (15:05 -0800) | ||
| commit | ade88e11b8b0c7bfcad8ebb6a71a0786552f7eb2 | |
| tree | cfa77b618d641245d36c57c8197cd89ee6510a0e | tree | snapshot |
| parent | a22741ce1d382c0eb911631603ee448b500cb093 | commit | 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>
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 |