projects / tools / git-buildpackage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 325fdb6) | patch
gbp-pull: two modes for --force
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Thu, 12 Jan 2012 13:26:55 +0000 (15:26 +0200)
committerJun Wang <junbill.wang@samsung.com>
Wed, 27 Jan 2016 11:24:42 +0000 (19:24 +0800)
commit65435b2ba785bb6f6e1feffc053cea73360c063f
tree7691f5e2e5bc52d265eded8514f7b7745df1a274tree | snapshot
parent325fdb62ddf694ac8c6dcba18facc171e19aa2e9commit | diff
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
Domain: SCM / Build;