summaryrefslogtreecommitdiff
path: root/unpack-file.c
diff options
context:
space:
mode:
authorLibravatar Robin Rosenberg <robin.rosenberg.lists@dewire.com>2008-12-21 14:17:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-21 18:32:04 -0800
commitd5be89d8ad88792a9716fbfdb499d6d852d0eff5 (patch)
treec728462e2f7e21ac04be51bafc9f403d7615e76e /unpack-file.c
parentMerge git://git.kernel.org/pub/scm/gitk/gitk (diff)
downloadtgif-d5be89d8ad88792a9716fbfdb499d6d852d0eff5.tar.xz
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 'unpack-file.c')
0 files changed, 0 insertions, 0 deletions