diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:15:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:15:55 -0700 |
| commit | 2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe (patch) | |
| tree | 3346bd647b350c29eb620f5a440b43513dc2ad2d /Documentation/config.txt | |
| parent | 07436e43daf1a97d3d702090d6289f745bd5ad90 (diff) | |
| parent | 57f6ec029090f64377ec5c0926b6e2e39b0caa4f (diff) | |
| download | git-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.tar.gz | |
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3:
Change mentions of "git programs" to "git commands"
Documentation: merge: one <remote> is required
help.c: give correct structure's size to memset()
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c6f09f801a..e94a8ab746 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -605,7 +605,7 @@ color.interactive.<slot>:: Use customized color for 'git-add --interactive' output. `<slot>` may be `prompt`, `header`, `help` or `error`, for four distinct types of normal output from interactive - programs. The values of these variables may be specified as + commands. The values of these variables may be specified as in color.branch.<slot>. color.pager:: @@ -1113,7 +1113,7 @@ instaweb.port:: linkgit:git-instaweb[1]. interactive.singlekey:: - In interactive programs, allow the user to provide one-letter + In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). Currently this is used only by the `\--patch` mode of linkgit:git-add[1]. Note that this setting is silently |