| commit | 86c726f0d1ac91a6dacb3ae306d830e9686ae703 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Sep 2017 08:02:49 +0000 (10 17:02 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Sep 2017 08:02:49 +0000 (10 17:02 +0900) | ||
| tree | 2c555bcab19798364b75852943ee4bea3ea1367e | treesnapshot (tar.gz zip) |
| parent | eba2a68f25c8afc56e204daf707e80613cc6e926 | commitdiff |
| parent | f826fb799ed06f2f9537466f6988bcabd1200ebd | commitdiff |
Merge branch 'pw/sequence-rerere-autoupdate' into maint
Commands like "git rebase" accepted the --rerere-autoupdate option
from the command line, but did not always use it. This has been
fixed.
* pw/sequence-rerere-autoupdate:
cherry-pick/revert: reject --rerere-autoupdate when continuing
cherry-pick/revert: remember --rerere-autoupdate
t3504: use test_commit
rebase -i: honor --rerere-autoupdate
rebase: honor --rerere-autoupdate
am: remember --rerere-autoupdate setting
Commands like "git rebase" accepted the --rerere-autoupdate option
from the command line, but did not always use it. This has been
fixed.
* pw/sequence-rerere-autoupdate:
cherry-pick/revert: reject --rerere-autoupdate when continuing
cherry-pick/revert: remember --rerere-autoupdate
t3504: use test_commit
rebase -i: honor --rerere-autoupdate
rebase: honor --rerere-autoupdate
am: remember --rerere-autoupdate setting