Browse Source

[sde-update-tree] Changed to use `git pull --rebase` which is smarter

karasz/new-early
Alejandro Mery 16 years ago
parent
commit
526d123c6d
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      bin/sde-update-tree

+ 1
- 1
bin/sde-update-tree

@ -81,7 +81,7 @@ for x in . package $( ls -1d package/* target/* 2> /dev/null ); do
elif [ -d "$x/.git" ]; then
cd "$x";
echo "$tree/$x:"
( git fetch --quiet && git reset && git rebase origin ) 2>&1 | indent_output
( git reset && git pull --rebase ) 2>&1 | indent_output
cd - > /dev/null
elif [ -d "$x/.svn" ]; then
cd "$x";

Loading…
Cancel
Save