with separator

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 9002abffe2e3395fc1b94cb01a251442adbdf72f..c480b0031183706eebfdad4785cae4e7123be0cf 100755 (executable)
--- 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
@@ -1221,6 +1221,19 @@ case "$cmd" in
                                rmuntracked=true
                        elif [ x"$X" = x"-D" ]; then
                                killbranches=true
+                       elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+                               msg ''
+                               msg '        _____'
+                               msg '    ,--'\''-\\P/`\\  FFFFFFF'
+                               msg ' __/_    B/,-.\\  FFFFFFF'
+                               msg ' /  _\\  (//  O\\\\  FFFFFF'
+                               msg '| (O  `) _\\._ _)\\  FFFUU'
+                               msg '| |___/.^d0~~"\\  \\ UUUU'
+                               msg '|     |`~'\''     \\ |  UUUU'
+                               msg '|     |    __,C>|| UUUU'
+                               msg '\\    /_ ,-/,-'\''   |  UUUU'
+                               msg ' \\\\_ \\_>~'\''      /  UUUU-'
+                               msg ''
                        else
                                break
                        fi