summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-13 11:24:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-13 11:24:17 -0700
commit5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc (patch)
tree279d8fae60071fc11dbf92e4cc32a9f69acebb65 /.gitattributes
parentMerge branch 'js/t3404-grammo-fix' (diff)
parentrebase -i: restore autostash on abort (diff)
downloadtgif-5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc.tar.xz
Merge branch 'ps/rebase-i-auto-unstash-upon-abort'
"git rebase -i --autostash" did not restore the auto-stashed change when the operation was aborted. * ps/rebase-i-auto-unstash-upon-abort: rebase -i: restore autostash on abort
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions