From 5ceca506182982aac6dbf1041b7e120dca00327a Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 16 Oct 2010 10:19:19 +0200 Subject: Always use git origins, remove GIT_USE_ORIGIN setting --- man/5/caretaker.conf.pod | 9 --------- man/7/caretaker.pod | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'man') 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=I [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 BI {I} Define the global hook I, its I 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 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 -- cgit v1.2.3