diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-11-10 11:26:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-10 11:26:18 -0800 |
| commit | a4c4708fe6a065aae7e9bb4ce940e76c42d74171 (patch) | |
| tree | 28b8b254bb0c13539bb545c5780e88eb5830214d | |
| parent | bd51886f304f8ce2e83aed8a52b20553acb09373 (diff) | |
| parent | a79c3a1b815b2ee5bdf5ad0d2c0c0cebbaa74fa9 (diff) | |
| download | git-a4c4708fe6a065aae7e9bb4ce940e76c42d74171.tar.gz | |
Sync with maint
* maint:
Documentation/config.txt: fix minor typo
config.txt: fix typo
| -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 e8dd76d979..922072596f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -683,7 +683,7 @@ alias.*:: confusion and troubles with script usage, aliases that hide existing Git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. - quote pair and a backslash can be used to quote them. + A quote pair or a backslash can be used to quote them. + If the alias expansion is prefixed with an exclamation point, it will be treated as a shell command. For example, defining @@ -2339,7 +2339,7 @@ status.showUntrackedFiles:: files which are not currently tracked by Git. Directories which contain only untracked files, are shown with the directory name only. Showing untracked files means that Git needs to lstat() all - all the files in the whole repository, which might be slow on some + the files in the whole repository, which might be slow on some systems. So, this variable controls how the commands displays the untracked files. Possible values are: + |