diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-03 01:51:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-03 14:55:11 -0800 |
| commit | 160252f81626d865b9e902abffe5e4976944c930 (patch) | |
| tree | 667f2453733fbb2f12fdaef832639c51132a01fc /commit.c | |
| parent | Add 'ours' merge strategy. (diff) | |
| download | git-160252f81626d865b9e902abffe5e4976944c930.tar.gz git-160252f81626d865b9e902abffe5e4976944c930.zip | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions