summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2010-10-16 10:19:19 +0200
committerDaniel Friesel <derf@finalrewind.org>2010-10-16 10:19:19 +0200
commit5ceca506182982aac6dbf1041b7e120dca00327a (patch)
treef5bc169ffcb79cbf0b79443f3d0f25740907dfec /man
parent84e2e6aef4ef92e5e416e4f762993ccb606bfa30 (diff)
Always use git origins, remove GIT_USE_ORIGIN setting
Diffstat (limited to 'man')
-rw-r--r--man/5/caretaker.conf.pod9
-rw-r--r--man/7/caretaker.pod3
2 files changed, 1 insertions, 11 deletions
diff --git a/man/5/caretaker.conf.pod b/man/5/caretaker.conf.pod
index 5fbbc3a..c3c3614 100644
--- a/man/5/caretaker.conf.pod
+++ b/man/5/caretaker.conf.pod
@@ -64,15 +64,6 @@ Operate in silent mode. If B<1>, it also sets PROGRESS=0
If 1, automatically execute 'ct update' before 'ct push'
and 'ct update remote' before 'ct upgrade'
-=item B<GIT_USE_ORIGIN>=I<boolean> [1]
-
-By default, caretaker will simply issue a git push/pull, so that git will use the
-repository's origin to determine where to push/pull.
-
-If you regularly change your PKG_ROOT, are too lazy to properly configure your
-git repos or whatever, set this to 0. Then, caretaker will always call git pull/push
-with both the remote repo and the branch as arguments.
-
=item B<function pkg_hook_>I<hook> {I<content>}
Define the global hook I<hook>, its I<content> will be executed
diff --git a/man/7/caretaker.pod b/man/7/caretaker.pod
index 9146437..5b83658 100644
--- a/man/7/caretaker.pod
+++ b/man/7/caretaker.pod
@@ -268,8 +268,7 @@ provided by packages.
B<caretaker> uses git(1) as backend for storing and syncing package information.
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 caretaker.
+In theory they should work, but will likely cause major confusion.
=head1 AUTHOR