summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2009-04-20 22:26:22 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2009-04-20 22:26:22 +0200
commit7a4767f26f2f38fddd9d7bf3dc581b5bbf663ab3 (patch)
tree950ac5a76ffa446497da73f947620d7719d758df
parent59104b04919882e4495329bf0c247525eb0f367c (diff)
pkg(7): git: Updated information about the master branch
-rw-r--r--man/7/pkg6
1 files changed, 3 insertions, 3 deletions
diff --git a/man/7/pkg b/man/7/pkg
index 9889cf1..d193a7d 100644
--- a/man/7/pkg
+++ b/man/7/pkg
@@ -228,9 +228,9 @@ provided by packages.
=head1 GIT
B<pkg> uses git(1) as backend for storing and syncing package information.
-Currently it can only operate on the master branch, so it is strongly
-recommended not to use any other branches, or you might end up with unwanted
-merges.
+It is not recommended to use branches other than "master".
+While they should work if GIT_USE_ORIGIN is set to 1 (the default), they will
+most likely confuse pkg update.
=head1 AUTHOR