[Frugalware-git] pacman-tools: man repoman: be sure to pull before merging a wip repo

[Miklos Vajna]

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

commit 07b92425a2fe02a9b30206b57ed6a0219f55f765
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Wed Jun 9 22:00:51 2010 +0200

man repoman: be sure to pull before merging a wip repo

diff --git a/repoman.txt b/repoman.txt
index 0f674ae..86581ce 100644
--- a/repoman.txt
+++ b/repoman.txt
@@ -352,8 +352,10 @@ $ repoman -t flac113 -k push

=== Merge

-Once you are ready, go to '\~/git/current' (make sure you don't have anything to
-push!) and
+Once you are ready, go to '\~/git/current'. Push your local commits if
+you have ones. If you don't have any, just pull, so that you can be sure
+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