mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
5be60078c9
This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
14 lines
335 B
Bash
Executable file
14 lines
335 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
|