diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:49 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:49 +0900 |
| commit | 86c726f0d1ac91a6dacb3ae306d830e9686ae703 (patch) | |
| tree | 2c555bcab19798364b75852943ee4bea3ea1367e /builtin/prune-packed.c | |
| parent | Merge branch 'bw/push-options-recursively-to-submodules' into maint (diff) | |
| parent | cherry-pick/revert: reject --rerere-autoupdate when continuing (diff) | |
| download | tgif-86c726f0d1ac91a6dacb3ae306d830e9686ae703.tar.xz | |
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
Diffstat (limited to 'builtin/prune-packed.c')
0 files changed, 0 insertions, 0 deletions