diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-07 22:43:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-07 22:43:46 -0800 |
| commit | 60e3cad92ed93120b9e77116163b267fdda44f91 (patch) | |
| tree | 240c556d8ce0d95433e4680b6725e5754d098627 /Documentation | |
| parent | ba51795c5fc32a507df9f91ffeae21893e9e7633 (diff) | |
| parent | c8744d6a8b27115503565041566d97c21e722584 (diff) | |
| download | git-60e3cad92ed93120b9e77116163b267fdda44f91.tar.gz | |
Merge branch 'maint'
* maint:
unquote_c_style: fix off-by-one.
test-lib: fix TERM to dumb for test repeatability
config.txt: refer to --upload-pack and --receive-pack instead of --exec
git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 683a53a0be..c5e094a9c4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -896,15 +896,15 @@ remote.<name>.skipDefaultUpdate:: remote.<name>.receivepack:: The default program to execute on the remote side when pushing. See - option \--exec of linkgit:git-push[1]. + option \--receive-pack of linkgit:git-push[1]. remote.<name>.uploadpack:: The default program to execute on the remote side when fetching. See - option \--exec of linkgit:git-fetch-pack[1]. + option \--upload-pack of linkgit:git-fetch-pack[1]. remote.<name>.tagopt:: - Setting this value to --no-tags disables automatic tag following when fetching - from remote <name> + Setting this value to \--no-tags disables automatic tag following when + fetching from remote <name> remotes.<group>:: The list of remotes which are fetched by "git remote update |