summaryrefslogtreecommitdiff
path: root/t/t2000-checkout-cache-clash.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-29 16:49:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-29 16:49:46 -0700
commitcec5f0bf80a972caedb72ad76dd0b0c0716bf9ff (patch)
tree08573bed3eff6425e6d674b82b7ad3565c33ef33 /t/t2000-checkout-cache-clash.sh
parentMerge branch 'ls/travis-homebrew-path-fix' into maint (diff)
parentrebase -i: improve advice on bad instruction lines (diff)
downloadtgif-cec5f0bf80a972caedb72ad76dd0b0c0716bf9ff.tar.xz
Merge branch 'rt/rebase-i-broken-insn-advise' into maint
When "git rebase -i" is given a broken instruction, it told the user to fix it with "--edit-todo", but didn't say what the step after that was (i.e. "--continue"). * rt/rebase-i-broken-insn-advise: rebase -i: improve advice on bad instruction lines
Diffstat (limited to 't/t2000-checkout-cache-clash.sh')
0 files changed, 0 insertions, 0 deletions