diff options
author | Andrew Pimlott <andrew@pimlott.net> | 2013-06-27 12:26:31 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 13:52:41 -0700 |
commit | 22c5b136363c7aa427667876e787db832548a038 (patch) | |
tree | 9c65417aa9e672f8feb61ce00a8edbb6b7bcddc2 /Documentation/build-docdep.perl | |
parent | Update draft release notes to 1.8.4 (diff) | |
download | tgif-22c5b136363c7aa427667876e787db832548a038.tar.xz |
rebase -i: handle fixup! fixup! in --autosquash
In rebase -i --autosquash, ignore all "fixup! " or "squash! " after the
first. This supports the case when a git commit --fixup/--squash referred
to an earlier fixup/squash instead of the original commit (whether
intentionally, as when the user expressly meant to note that the commit
fixes an earlier fixup; or inadvertently, as when the user meant to refer to
the original commit with :/msg; or out of laziness, as when the user could
remember how to refer to the fixup but not the original).
In the todo list, the full commit message is preserved, in case it provides
useful cues to the user. A test helper set_cat_todo_editor is introduced to
check this.
Helped-by: Thomas Rast <trast@inf.ethz.ch>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Andrew Pimlott <andrew@pimlott.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/build-docdep.perl')
0 files changed, 0 insertions, 0 deletions