summaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg.lists@dewire.com>2008-12-21 14:17:12 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-21 18:32:04 -0800
commitd5be89d8ad88792a9716fbfdb499d6d852d0eff5 (patch)
treec728462e2f7e21ac04be51bafc9f403d7615e76e /builtin-revert.c
parent834caf9a7b0850d5647426bcb7c4dae04d85a922 (diff)
downloadgit-d5be89d8ad88792a9716fbfdb499d6d852d0eff5.tar.gz
git-revert: record the parent against which a revert was made
As described in Documentation/howto/revert-a-faulty-merge.txt, re-merging from a previously reverted a merge of a side branch may need a revert of the revert beforehand. Record against which parent the revert was made in the commit, so that later the user can figure out what went on. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-revert.c')
-rw-r--r--builtin-revert.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index 4038b4118d..d48313c745 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -352,6 +352,11 @@ static int revert_or_cherry_pick(int argc, const char **argv)
add_to_msg(oneline_body + 1);
add_to_msg("\"\n\nThis reverts commit ");
add_to_msg(sha1_to_hex(commit->object.sha1));
+
+ if (commit->parents->next) {
+ add_to_msg(", reversing\nchanges made to ");
+ add_to_msg(sha1_to_hex(parent->object.sha1));
+ }
add_to_msg(".\n");
} else {
base = parent;