summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2013-04-02 07:40:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-02 17:41:42 (GMT)
commit224c2171637ee71c36cb6b0ed314d14216725d6f (patch)
tree711aa2f13216d2c8676481515efa11c7ab84a676 /Documentation
parentf24f715e05399cba19cb9455fdd7d8a9806fe61b (diff)
downloadgit-224c2171637ee71c36cb6b0ed314d14216725d6f.zip
git-224c2171637ee71c36cb6b0ed314d14216725d6f.tar.gz
git-224c2171637ee71c36cb6b0ed314d14216725d6f.tar.bz2
remote.c: introduce remote.pushdefault
This new configuration variable defines the default remote to push to, and overrides `branch.<name>.remote` for all branches. It is useful in the typical triangular-workflow setup, where the remote you're fetching from is different from the remote you're pushing to. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt13
1 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f79184c..9c6fd4a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -727,9 +727,12 @@ branch.autosetuprebase::
This option defaults to never.
branch.<name>.remote::
- When in branch <name>, it tells 'git fetch' and 'git push' which
- remote to fetch from/push to. It defaults to `origin` if no remote is
- configured. `origin` is also used if you are not on any branch.
+ When on branch <name>, it tells 'git fetch' and 'git push'
+ which remote to fetch from/push to. The remote to push to
+ may be overridden with `remote.pushdefault` (for all branches).
+ If no remote is configured, or if you are not on any branch,
+ it defaults to `origin` for fetching and `remote.pushdefault`
+ for pushing.
branch.<name>.merge::
Defines, together with branch.<name>.remote, the upstream branch
@@ -1898,6 +1901,10 @@ receive.updateserverinfo::
If set to true, git-receive-pack will run git-update-server-info
after receiving data from git-push and updating refs.
+remote.pushdefault::
+ The remote to push to by default. Overrides
+ `branch.<name>.remote` for all branches.
+
remote.<name>.url::
The URL of a remote repository. See linkgit:git-fetch[1] or
linkgit:git-push[1].