]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d3d7a42) | patch
rebase: teach --autosquash to match on sha1 in addition to message
authorKevin Ballard <kevin@sb.org>
Thu, 4 Nov 2010 22:36:32 +0000 (15:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Nov 2010 17:44:19 +0000 (09:44 -0800)
commit68d5d03bc49a073be3b0e14b22d30d70e7ae686d
tree11b5cefb1c1264156c2ed0a5a02d208baf44dc86tree | snapshot
parentd3d7a421b1439a6f08dfbcd2e3327cbe90c93417commit | diff
rebase: teach --autosquash to match on sha1 in addition to message

Support lines of the form "fixup! 7a235b" that specify an exact commit
in addition to the normal "squash! Old commit message" form.

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh diff | blob | blame | history
t/t3415-rebase-autosquash.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.