summaryrefslogtreecommitdiff
path: root/t/t4013/diff.format-patch_--inline_--stdout_initial..master^
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-22 18:22:08 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-22 18:22:08 -0800
commit9fd389b65002e0e23deb2c7328360f246afec0d4 (patch)
tree6f18d8e46376adb637fddb8fca407c54021365bc /t/t4013/diff.format-patch_--inline_--stdout_initial..master^
parentMerge branch 'maint' (diff)
parentrevert: remove --reset compatibility option (diff)
downloadtgif-9fd389b65002e0e23deb2c7328360f246afec0d4.tar.xz
Merge branch 'jn/revert-quit'
* jn/revert-quit: revert: remove --reset compatibility option revert: introduce --abort to cancel a failed cherry-pick revert: write REVERT_HEAD pseudoref during conflicted revert revert: improve error message for cherry-pick during cherry-pick revert: rearrange pick_revisions() for clarity revert: rename --reset option to --quit
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master^')
0 files changed, 0 insertions, 0 deletions