X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=af5b22cb33cc411a57f7a72571da7867c834a6ce;hp=933a51b6e78259583b56f9e06e2ca6ef1000d6e4;hb=ad6535cc2acd942e4bc2237e2ea4e7b198666342;hpb=94ce252c0a5547d0462c4964d3282e0fc0e0d1c0 diff --git a/all b/all index 933a51b6..af5b22cb 100755 --- a/all +++ b/all @@ -104,7 +104,7 @@ yesno() enter() { - $2 cd "$1" + $2 cd "$1" || exit 1 check_mergeconflict "$1" } @@ -199,6 +199,8 @@ case "$cmd" in verbose git config remote.origin.url "$url" verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" + verbose git config remote.origin.autocrlf input + r=`git symbolic-ref HEAD` r=${r#refs/heads/} if git config branch.$r.remote >/dev/null 2>&1; then