summaryrefslogtreecommitdiff
path: root/t/t3413-rebase-hook.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-07-02 12:53:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-02 12:53:04 -0700
commit6293aea559b6c8f224f748e5a2a641ddb6cca55a (patch)
tree0d67ca045e0ffb1d92a1a11e3e7aa4b7e58cc6b3 /t/t3413-rebase-hook.sh
parentMerge branch 'jk/commit-buffer-length' (diff)
parentrebase--merge: fix --skip with two conflicts in a row (diff)
downloadtgif-6293aea559b6c8f224f748e5a2a641ddb6cca55a.tar.xz
Merge branch 'bc/fix-rebase-merge-skip'
"git rebase --skip" did not work well when it stopped due to a conflict twice in a row. * bc/fix-rebase-merge-skip: rebase--merge: fix --skip with two conflicts in a row
Diffstat (limited to 't/t3413-rebase-hook.sh')
0 files changed, 0 insertions, 0 deletions