| commit | d5be89d8ad88792a9716fbfdb499d6d852d0eff5 | |
| author | Robin Rosenberg <robin.rosenberg.lists@dewire.com> | |
| Sun, 21 Dec 2008 22:17:12 +0000 (21 14:17 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Dec 2008 02:32:04 +0000 (21 18:32 -0800) | ||
| tree | c728462e2f7e21ac04be51bafc9f403d7615e76e | treesnapshot (tar.gz zip) |
| parent | 834caf9a7b0850d5647426bcb7c4dae04d85a922 | commitdiff |
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>
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>
| builtin-revert.c | diffblobblamehistory |