diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-16 13:48:55 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-16 13:48:55 -0700 |
| commit | 9a36190f8dc4e33f63bcfd73e32f7c3a1c6c1c71 (patch) | |
| tree | d965f1137cd428f7b1f56c12383234e050f8a19d /bin/git-pull-safe | |
| parent | ec981cb46fa43eab3511a97efc2cd0dba5141d2e (diff) | |
| download | dotfiles-9a36190f8dc4e33f63bcfd73e32f7c3a1c6c1c71.tar.gz | |
tidy up pull-safe output
Diffstat (limited to 'bin/git-pull-safe')
| -rwxr-xr-x | bin/git-pull-safe | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/git-pull-safe b/bin/git-pull-safe index 9ce00cb0..d0ee56ea 100755 --- a/bin/git-pull-safe +++ b/bin/git-pull-safe @@ -29,11 +29,11 @@ branches="$(git for-each-ref --format='%(refname:short)' refs/heads/)" git remote update for branch in $branches; do remote="$(branch_remote $branch 2>/dev/null || true)" - # echo "I: branch $branch has prefix $prefix and remote $remote" if [ "$(branch_prefix $branch)" != "dgit" ] && [ "$remote" != "" ]; then # if the branch cannot be fast-forwarded, git-merge-ff will # exit non-zero, so myrepos will report that the update # failed, so user intervention is required + echo "I: attempting to fast-forward local branch $branch" git merge-ff "$branch" fi done |