summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 23:55:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-24 23:55:15 (GMT)
commitcbcf0a6981687b31635d806f45e77188c54b7cfc (patch)
tree9b64faf7b902baa10fb0451a660992cb16b1e9ad /builtin/checkout.c
parent786f174dab50ea5333fadd1650aa709927a3099f (diff)
parent68d5d03bc49a073be3b0e14b22d30d70e7ae686d (diff)
downloadgit-cbcf0a6981687b31635d806f45e77188c54b7cfc.zip
git-cbcf0a6981687b31635d806f45e77188c54b7cfc.tar.gz
git-cbcf0a6981687b31635d806f45e77188c54b7cfc.tar.bz2
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 'builtin/checkout.c')
0 files changed, 0 insertions, 0 deletions