| commit | 160252f81626d865b9e902abffe5e4976944c930 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 3 Nov 2005 09:51:25 +0000 (3 01:51 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 3 Nov 2005 22:55:11 +0000 (3 14:55 -0800) | ||
| tree | 667f2453733fbb2f12fdaef832639c51132a01fc | treesnapshot (tar.gz zip) |
| parent | 64da9e604eea25c9c20cfe12618285ccd0bf3cfe | commitdiff |
git-merge-ours: make sure our index matches HEAD
git-merge expects this check to be done appropriately by the
merge strategy backends. In the case of merge-ours strategy,
the resulting tree comes what we have in the index file, so it
must match the current HEAD; otherwise it would not be "ours"
merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge expects this check to be done appropriately by the
merge strategy backends. In the case of merge-ours strategy,
the resulting tree comes what we have in the index file, so it
must match the current HEAD; otherwise it would not be "ours"
merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-ours.sh | diffblobblamehistory |