File: git-merge-ours.sh

package info (click to toggle)
git-core 1%3A1.4.4.4-2
  • links: PTS
  • area: main
  • in suites: etch-m68k
  • size: 5,980 kB
  • ctags: 5,444
  • sloc: ansic: 50,068; sh: 14,854; perl: 12,752; tcl: 5,714; python: 2,754; makefile: 981; lisp: 977; asm: 219
file content (14 lines) | stat: -rwxr-xr-x 356 bytes parent folder | download | duplicates (2) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#

# We need to exit with 2 if the index does not match our HEAD tree,
# because the current index is what we will be committing as the
# merge result.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0