diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:00 -0700 |
| commit | 1016495a7190911b37c354f7a985278c51ae6666 (patch) | |
| tree | 63d8897867229a377473b122902337658948add2 /compat/inet_pton.c | |
| parent | Merge branch 'bw/push-options-recursively-to-submodules' (diff) | |
| parent | cherry-pick/revert: reject --rerere-autoupdate when continuing (diff) | |
| download | tgif-1016495a7190911b37c354f7a985278c51ae6666.tar.xz | |
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 'compat/inet_pton.c')
0 files changed, 0 insertions, 0 deletions