Sometimes a failed automatic merge means that we do not want those
changes. In this case, it is desirable to commit the current HEAD (as if
actually something was merged).
Signed-off-by: Johannes Schindelin <[EMAIL PROTECTED]>
---
git-commit-script | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
89e6c9495d7877e9922b22d6c87f51c6902b7056
diff --git a/git-commit-script b/git-commit-script
--- a/git-commit-script
+++ b/git-commit-script
@@ -6,12 +6,16 @@
. git-sh-setup-script || die "Not a git archive"
usage () {
- die 'git commit [-m existing-commit] [<path>...]'
+ die 'git commit [-f] [-m existing-commit] [<path>...]'
}
+force=false
while case "$#" in 0) break ;; esac
do
case "$1" in
+ -f) shift
+ force=true
+ ;;
-m) shift
case "$#" in
0) usage ;;
@@ -82,7 +86,7 @@ else
fi >.editmsg
git-status-script >>.editmsg
fi
-if [ "$?" != "0" ]
+if [ "$?" != "0" -a $force = false ]
then
cat .editmsg
rm .editmsg
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
