summaryrefslogtreecommitdiff
path: root/builtin-commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-14 11:57:22 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-14 15:39:54 -0800
commit1eb1e9eea480059d4fba171e74a4375b8191e3f3 (patch)
tree342a087ad1337f4e3f32315fc5c3c2423a0785e4 /builtin-commit.c
parent12a6d752fb61b10194b2897defb2b34e09099b12 (diff)
downloadgit-1eb1e9eea480059d4fba171e74a4375b8191e3f3.tar.gz
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>
Diffstat (limited to 'builtin-commit.c')
-rw-r--r--builtin-commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index ad9f9211b3..518ebe0347 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -537,7 +537,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
die("Option -m cannot be combined with -c/-C/-F.");
if (edit_message)
use_message = edit_message;
- if (amend)
+ if (amend && !use_message)
use_message = "HEAD";
if (use_message) {
unsigned char sha1[20];