]> git.ipfire.org Git - thirdparty/git.git/commit - git-merge-ours.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 64da9e6) | patch
git-merge-ours: make sure our index matches HEAD
authorJunio C Hamano <junkio@cox.net>
Thu, 3 Nov 2005 09:51:25 +0000 (01:51 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 3 Nov 2005 22:55:11 +0000 (14:55 -0800)
commit160252f81626d865b9e902abffe5e4976944c930
tree667f2453733fbb2f12fdaef832639c51132a01fctree | snapshot
parent64da9e604eea25c9c20cfe12618285ccd0bf3cfecommit | diff
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-ours.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.