mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
d25430c5f8
* maint: scripts: do not get confused with HEAD in work tree Improve description of git-branch -d and -D in man page.
14 lines
338 B
Bash
Executable file
14 lines
338 B
Bash
Executable file
#!/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.
|
|
|
|
git diff-index --quiet --cached HEAD -- || exit 2
|
|
|
|
exit 0
|