From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 12 Jan 2012 13:25:57 +0000 (+0200)
Subject: gbp-pull: similar update strategy for all branches
X-Git-Tag: debian/0.6.26~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=325fdb62ddf694ac8c6dcba18facc171e19aa2e9;p=tools%2Fgit-buildpackage.git

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
---