projects / tools / git-buildpackage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3d0453b) | patch
gbp-pull: similar update strategy for all branches
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Thu, 12 Jan 2012 13:25:57 +0000 (15:25 +0200)
committerJun Wang <junbill.wang@samsung.com>
Wed, 27 Jan 2016 11:24:03 +0000 (19:24 +0800)
commit325fdb62ddf694ac8c6dcba18facc171e19aa2e9
tree7691f5e2e5bc52d265eded8514f7b7745df1a274tree | snapshot
parent3d0453b3a90d45275fb5c174b72c1ab6ff0d8278commit | diff
gbp-pull: similar update strategy for all branches

Treat non-checked-out branches similarly to the current branch when
forcing update. That is, do git merge, instead of just setting the ref.

Also, renames fast_forward_branch() to update_branch() to better match
the functionality.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/scripts/pull.py
Domain: SCM / Build;