From: Rudolf Polzer Date: Wed, 3 Nov 2010 09:42:43 +0000 (+0100) Subject: I wanted -C X-Git-Tag: xonotic-v0.1.0preview~90 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd77a4af9c0df9ec3ecdfa72c240fc0c5f8f15a3;p=xonotic%2Fxonotic.git I wanted -C --- 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