projects / tools / git-buildpackage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 86d7668) | 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)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Fri, 14 Nov 2014 12:22:11 +0000 (14:22 +0200)
commit4b6a2355f0754d0fb87ec3d4718be3c621b16d65
tree754ca0d3b1ad74858dd5652cd3c7d4b7df2bedfbtree | snapshot
parent86d7668d7d6dddf10af9bb052f655a0787ed2b78commit | 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>
gbp/scripts/pull.py diff | blob | history
Domain: SCM / Build;