diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 20:29:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 20:29:00 +0300 |
| commit | 1016495a7190911b37c354f7a985278c51ae6666 (patch) | |
| tree | 63d8897867229a377473b122902337658948add2 /builtin/mv.c | |
| parent | a49794d10826ef7cc9237abcf6474cd826de1063 (diff) | |
| parent | f826fb799ed06f2f9537466f6988bcabd1200ebd (diff) | |
Merge branch 'pw/sequence-rerere-autoupdate'
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
Diffstat (limited to 'builtin/mv.c')
0 files changed, 0 insertions, 0 deletions