From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 12 Jan 2012 13:26:55 +0000 (+0200)
Subject: gbp-pull: two modes for --force
X-Git-Tag: debian/0.6.26~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65435b2ba785bb6f6e1feffc053cea73360c063f;p=tools%2Fgit-buildpackage.git

gbp-pull: two modes for --force

The 'force' option now has two possible values:
'merge': upstream branch is merged, even if fast-forward is not
possible.

'clean': check out a clean copy from the upstream if fast-forward is not
possible (i.e. no merge). Local changes are lost in this case.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

Conflicts:
	docs/manpages/gbp-pull.sgml
---