projects
/
tools
/
git-buildpackage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
325fdb6
)
gbp-pull: two modes for --force
author
Markus Lehtonen
<markus.lehtonen@linux.intel.com>
Thu, 12 Jan 2012 13:26:55 +0000
(15:26 +0200)
committer
Jun Wang
<junbill.wang@samsung.com>
Wed, 27 Jan 2016 11:24:42 +0000
(19:24 +0800)
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
No differences found