summaryrefslogtreecommitdiff
path: root/t/t4135/git-plain.diff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 10:29:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 10:29:00 -0700
commit1016495a7190911b37c354f7a985278c51ae6666 (patch)
tree63d8897867229a377473b122902337658948add2 /t/t4135/git-plain.diff
parentMerge branch 'bw/push-options-recursively-to-submodules' (diff)
parentcherry-pick/revert: reject --rerere-autoupdate when continuing (diff)
downloadtgif-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 't/t4135/git-plain.diff')
0 files changed, 0 insertions, 0 deletions