summaryrefslogtreecommitdiff
path: root/diff-no-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-11-24 15:55:15 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-24 15:55:15 -0800
commitcbcf0a6981687b31635d806f45e77188c54b7cfc (patch)
tree9b64faf7b902baa10fb0451a660992cb16b1e9ad /diff-no-index.c
parentMerge branch 'mm/phrase-remote-tracking' (diff)
parentrebase: teach --autosquash to match on sha1 in addition to message (diff)
downloadtgif-cbcf0a6981687b31635d806f45e77188c54b7cfc.tar.xz
Merge branch 'kb/maint-rebase-autosquash'
* kb/maint-rebase-autosquash: rebase: teach --autosquash to match on sha1 in addition to message rebase: better rearranging of fixup!/squash! lines with --autosquash
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions