[Frugalware-git] pacman-tools: man repoman: add '--no-ff' in the example about merging wip

Melko melko at frugalware.org
Tue Aug 21 11:34:01 CEST 2012


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=604adea288cd7c8227cf0d2ba0db10faed83171e

commit 604adea288cd7c8227cf0d2ba0db10faed83171e
Author: Melko <melko at frugalware.org>
Date:   Tue Aug 21 11:30:26 2012 +0200

man repoman: add '--no-ff' in the example about merging wip

diff --git a/repoman.txt b/repoman.txt
index f0c11fb..3030aac 100644
--- a/repoman.txt
+++ b/repoman.txt
@@ -396,7 +396,7 @@ you will be able to push the result of the merge. Perform the merge
using:

----
-$ git pull --no-rebase nick at git.frugalware.org:/pub/other/people/nick/flac113 master
+$ git pull --no-rebase --no-ff nick at git.frugalware.org:/pub/other/people/nick/flac113 master
----

This will merge your WIP repo to your local current repo. If there are


More information about the Frugalware-git mailing list