diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-01-12 15:26:55 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:22:11 +0200 |
| commit | 2d72c556e17230258fb9f8366bf4280436e5f82e (patch) | |
| tree | fc3b82264de6d317b45e10bf9fb0fe434c034691 /docs | |
| parent | 4b6a2355f0754d0fb87ec3d4718be3c621b16d65 (diff) | |
| download | git-buildpackage-2d72c556e17230258fb9f8366bf4280436e5f82e.tar.gz git-buildpackage-2d72c556e17230258fb9f8366bf4280436e5f82e.tar.bz2 git-buildpackage-2d72c556e17230258fb9f8366bf4280436e5f82e.zip | |
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>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manpages/gbp-pull.sgml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml index de076b7f..5c7f258f 100644 --- a/docs/manpages/gbp-pull.sgml +++ b/docs/manpages/gbp-pull.sgml @@ -22,7 +22,7 @@ &gbp-pull; &man.common.options.synopsis; - <arg><option>--force</option></arg> + <arg><option>--force=</option><replaceable>[merge|clean]</replaceable></arg> <arg><option>--all</option></arg> <arg><option>--redo-pq</option></arg> <arg><option>--[no-]pristine-tar</option></arg> @@ -48,11 +48,14 @@ &man.common.options.description; <varlistentry> - <term><option>--force</option></term> + <term><option>--force=</option><replaceable>[merge|clean]</replaceable></term> <listitem> - <para>force a branch update even if this results in a non fast - forward update. <warning><para>Forcing a branch update - makes you lose your modifications.</para></warning></para> + <para>Force a branch update even if this results in a non fast + forward update. + <emphasis>merge</emphasis> does a git-merge. + <emphasis>clean</emphasis> checks out a clean copy from upstream. + <warning><para>using <emphasis>clean</emphasis> + makes you lose your modifications.</para></warning></para> </listitem> </varlistentry> <varlistentry> |