summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 18:24:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-13 18:24:17 (GMT)
commit5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc (patch)
tree279d8fae60071fc11dbf92e4cc32a9f69acebb65 /builtin/grep.c
parent6c35952a081ad897643d4d23615ccc429c924a39 (diff)
parent33ba9c648b6753a4184e53ffb89f0a924f9f7b7e (diff)
downloadgit-5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc.zip
git-5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc.tar.gz
git-5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc.tar.bz2
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 'builtin/grep.c')
0 files changed, 0 insertions, 0 deletions