From fd77a4af9c0df9ec3ecdfa72c240fc0c5f8f15a3 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 3 Nov 2010 10:42:43 +0100 Subject: [PATCH] I wanted -C --- all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/all b/all index 9002abff..89c1d6ed 100755 --- a/all +++ b/all @@ -1138,7 +1138,7 @@ case "$cmd" in # apply crlf, or other cleanup filters (non-behavioural changes) git reset --hard find . -type f -exec touch {} \; - git commit -a --amend -c HEAD || true # don't fail if nothing to commit + git commit -a --amend -C HEAD || true # don't fail if nothing to commit echo "MERGING" case ",`repoflags "$d"`," in -- 2.39.2