diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:36:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:36:04 -0700 |
| commit | 6ffd781226f04629eff63a684b47ad7555143312 (patch) | |
| tree | e41ea02c886afd117f51b257d57f84043e447efd /Documentation/config.txt | |
| parent | 19a7fcbf16276321f83e0c1748b3935a2ea42675 (diff) | |
| parent | 2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe (diff) | |
| download | git-6ffd781226f04629eff63a684b47ad7555143312.tar.gz | |
Merge branch 'maint'
* maint:
push: point to 'git pull' and 'git push --force' in case of non-fast forward
Documentation: add: <filepattern>... is optional
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 7791c32bc3..2632c5149e 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 |