Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=604adea288cd7c8227cf0d2ba0db10faed83171e
commit 604adea288cd7c8227cf0d2ba0db10faed83171e Author: Melko <[email protected]> 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 [email protected]:/pub/other/people/nick/flac113 master +$ git pull --no-rebase --no-ff [email protected]:/pub/other/people/nick/flac113 master ---- This will merge your WIP repo to your local current repo. If there are _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
