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