author | Junio C Hamano <gitster@pobox.com> | |
Fri, 14 Dec 2007 19:57:22 +0000 (11:57 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 14 Dec 2007 23:39:54 +0000 (15:39 -0800) | ||
commit | 1eb1e9eea480059d4fba171e74a4375b8191e3f3 | |
tree | 342a087ad1337f4e3f32315fc5c3c2423a0785e4 | tree | snapshot |
parent | 12a6d752fb61b10194b2897defb2b34e09099b12 | commit | diff |
commit: allow --amend to reuse message from another commit
After tentatively applying a patch from a contributor, you can get a
replacement patch with corrected code and unusable commit log message.
In such a case, this sequence ought to give you an editor based on the
message in the earlier commit, to let you describe an incremental
improvement:
git reset --hard HEAD^ ;# discard the earlier one
git am <corrected-patch
git commit --amend -c HEAD@{1}
Unfortunately, --amend insisted reusing the message from the commit
being amended, ignoring the -c option. This corrects it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
After tentatively applying a patch from a contributor, you can get a
replacement patch with corrected code and unusable commit log message.
In such a case, this sequence ought to give you an editor based on the
message in the earlier commit, to let you describe an incremental
improvement:
git reset --hard HEAD^ ;# discard the earlier one
git am <corrected-patch
git commit --amend -c HEAD@{1}
Unfortunately, --amend insisted reusing the message from the commit
being amended, ignoring the -c option. This corrects it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-commit.c | diff | blob | history | |
t/t7501-commit.sh | diff | blob | history |