diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-23 19:29:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-23 19:29:05 -0700 |
| commit | 1259404c7e5cd88b7f6692986469cd20cbfacdad (patch) | |
| tree | cadffdf850a06e1d41ce1ebf4d1290e8d5768cfc /Documentation/config.txt | |
| parent | b4aee09e610567529dc619d7324dc2fe85a11db5 (diff) | |
| parent | a153adf683d2b6e22c7e892ed8a161b140156186 (diff) | |
| download | git-1259404c7e5cd88b7f6692986469cd20cbfacdad.tar.gz git-1259404c7e5cd88b7f6692986469cd20cbfacdad.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: Fix setting $/ in parse_commit()
daemon: do not die on older clients.
xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
git-clone: honor --quiet
Documentation for the [remote] config
prune-packed: Fix uninitialized variable.
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 05d657444..026d4cf9a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -230,6 +230,18 @@ pull.octopus:: pull.twohead:: The default merge strategy to use when pulling a single branch. +remote.<name>.url:: + The URL of a remote repository. See gitlink:git-fetch[1] or + gitlink:git-push[1]. + +remote.<name>.fetch:: + The default set of "refspec" for gitlink:git-fetch[1]. See + gitlink:git-fetch[1]. + +remote.<name>.push:: + The default set of "refspec" for gitlink:git-push[1]. See + gitlink:git-push[1]. + repack.usedeltabaseoffset:: Allow gitlink:git-repack[1] to create packs that uses delta-base offset. Defaults to false. |