diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-23 09:03:15 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-23 09:03:15 +0100 |
| commit | 65c042d44dc843021f1410f1219104681fdd3469 (patch) | |
| tree | ead97f95ff999e3279929760d095c0edcb1adf1a /Documentation/config.txt | |
| parent | bisect: simplify calling visualizer using '--bisect' option (diff) | |
| parent | Re-implement 'git remote update' using 'git fetch' (diff) | |
| download | git-65c042d44dc843021f1410f1219104681fdd3469.tar.xz git-65c042d44dc843021f1410f1219104681fdd3469.zip | |
Merge branch 'bg/fetch-multi'
* bg/fetch-multi:
Re-implement 'git remote update' using 'git fetch'
builtin-fetch: add --dry-run option
builtin-fetch: add --prune option
teach warn_dangling_symref to take a FILE argument
remote: refactor some logic into get_stale_heads()
Add missing test for 'git remote update --prune'
Add the configuration option skipFetchAll
Teach the --multiple option to 'git fetch'
Teach the --all option to 'git fetch'
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 55d7e11da2..657f0016d3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1437,7 +1437,13 @@ remote.<name>.mirror:: remote.<name>.skipDefaultUpdate:: If true, this remote will be skipped by default when updating - using the update subcommand of linkgit:git-remote[1]. + using linkgit:git-fetch[1] or the `update` subcommand of + linkgit:git-remote[1]. + +remote.<name>.skipFetchAll:: + If true, this remote will be skipped by default when updating + using linkgit:git-fetch[1] or the `update` subcommand of + linkgit:git-remote[1]. remote.<name>.receivepack:: The default program to execute on the remote side when pushing. See |