git-send-email: Add --thread option
[git/aroben.git] / git-merge-ours.sh
blob2b6a5c0d104b09b2eb471be9ec86e215ac003b0a
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
5 # Pretend we resolved the heads, but declare our tree trumps everybody else.
8 # We need to exit with 2 if the index does not match our HEAD tree,
9 # because the current index is what we will be committing as the
10 # merge result.
12 git-diff-index --quiet --cached HEAD || exit 2
14 exit 0