From 44e1d2ae38bd0f5fd07b44fdc7ac5427834b7a43 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 3 Nov 2010 10:41:44 +0100 Subject: [PATCH] don't fail if nothing to commit --- all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/all b/all index 26a30277..9002abff 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 + git commit -a --amend -c HEAD || true # don't fail if nothing to commit echo "MERGING" case ",`repoflags "$d"`," in -- 2.39.2