diff options
| author |  Kevin Ballard <kevin@sb.org> | 2010-11-04 15:36:32 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-09 09:44:19 -0800 |
| commit | 68d5d03bc49a073be3b0e14b22d30d70e7ae686d (patch) | |
| tree | 11b5cefb1c1264156c2ed0a5a02d208baf44dc86 /Documentation/merge-options.txt | |
| parent | rebase: better rearranging of fixup!/squash! lines with --autosquash (diff) | |
| download | tgif-68d5d03bc49a073be3b0e14b22d30d70e7ae686d.tar.xz | |
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>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions