diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-07 16:37:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-07 16:37:13 -0700 |
commit | 63b6fdb8e5cadbb9ad619d06dcaf4a3b72c7d359 (patch) | |
tree | 3bd76390d32ef6ce9b0ad358241fe0b2e45e3588 /config.txt | |
parent | edf80bdff8acc2ba55267b047475925e8ee8c486 (diff) | |
download | git-htmldocs-63b6fdb8e5cadbb9ad619d06dcaf4a3b72c7d359.tar.gz |
Autogenerated HTML docs for v1.8.2.1-339-g52a3e
Diffstat (limited to 'config.txt')
-rw-r--r-- | config.txt | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/config.txt b/config.txt index f79184c0a..3d750e045 100644 --- a/config.txt +++ b/config.txt @@ -727,9 +727,22 @@ 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). + The remote to push to, for the current branch, may be further + overridden by `branch.<name>.pushremote`. 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>.pushremote:: + When on branch <name>, it overrides `branch.<name>.remote` for + pushing. It also overrides `remote.pushdefault` for pushing + from branch <name>. When you pull from one place (e.g. your + upstream) and push to another place (e.g. your own publishing + repository), you would want to set `remote.pushdefault` to + specify the remote to push to for all branches, and use this + option to override it for a specific branch. branch.<name>.merge:: Defines, together with branch.<name>.remote, the upstream branch @@ -1898,6 +1911,11 @@ 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, and is overridden by + `branch.<name>.pushremote` for specific branches. + remote.<name>.url:: The URL of a remote repository. See linkgit:git-fetch[1] or linkgit:git-push[1]. |