diff options
author | Guido Günther <agx@sigxcpu.org> | 2010-08-29 18:05:11 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2010-08-29 18:11:41 +0200 |
commit | 3262621bac0d06482d78d3a9c288c04f3627e341 (patch) | |
tree | 275c0a869b76e1d2b6410b34b8493cb1dea6c1ef /gbp-pull | |
parent | 39b1a07b8db07154fc7d97d87be11aa4c03e8c62 (diff) |
Properly handle local only changes as no update needed
Diffstat (limited to 'gbp-pull')
-rwxr-xr-x | gbp-pull | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -58,6 +58,7 @@ def fast_forward_branch(branch, repo, options): print >>sys.stderr, "Warning: Skipping non-fast forward of '%s' - use --force" % branch if update: + print "Updating '%s'" % branch repo.set_branch(branch) GitMerge(remote)() return update |