diff options
| author | Robin Rosenberg <robin.rosenberg.lists@dewire.com> | 2008-12-21 23:17:12 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-22 03:32:04 +0100 |
| commit | d5be89d8ad88792a9716fbfdb499d6d852d0eff5 (patch) | |
| tree | c728462e2f7e21ac04be51bafc9f403d7615e76e /builtin-revert.c | |
| parent | Merge git://git.kernel.org/pub/scm/gitk/gitk (diff) | |
| download | git-d5be89d8ad88792a9716fbfdb499d6d852d0eff5.tar.xz git-d5be89d8ad88792a9716fbfdb499d6d852d0eff5.zip | |
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.c | 5 |
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; |