commit b00f009f16754a0193e65ec52b8e77dcda5294a5 parent 42834325a4c3ea3b1c695cd3976538e928b2aad3 Author: sin <sin@2f30.org> Date: Tue, 26 Aug 2014 16:29:06 +0100 Do a git rebase --abort if we have conflicts Some minor cosmetic changes as well. Diffstat:
| M | git-update-all | | | 10 | +++++++--- |
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/git-update-all b/git-update-all @@ -2,13 +2,17 @@ # Update all git repos in current folder for i in *; do - if [ -d "$i"/.git ]; then + if test -d "$i/.git"; then cd "$i" - echo "Updating $i..." + echo ">> updating $i" git remote update git pull --rebase + if test $? -eq 1; then + echo ">> backing out rebase, fix manually" + git rebase --abort + fi cd - >/dev/null else - echo "Skipping $i... not a git repo" 1>&2 + echo ">> $i: not a git repo" 1>&2 fi done