diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 13:43:56 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 14:08:09 -0800 |
| commit | b3e4847e50cf0ab3da4ad9664a5e4382e778ebd5 (patch) | |
| tree | fef22310012dc596dae3483aece059edffa90590 /git-gui/lib/commit.tcl | |
| parent | rebase: remember strategy and strategy options (diff) | |
| download | git-b3e4847e50cf0ab3da4ad9664a5e4382e778ebd5.tar.gz git-b3e4847e50cf0ab3da4ad9664a5e4382e778ebd5.zip | |
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>
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions