Sync with maint

* maint:
  Documentation/config.txt: fix minor typo
  config.txt: fix typo
This commit is contained in:
Junio C Hamano 2014-11-10 11:26:18 -08:00
commit a4c4708fe6

View File

@ -683,7 +683,7 @@ alias.*::
confusion and troubles with script usage, aliases that confusion and troubles with script usage, aliases that
hide existing Git commands are ignored. Arguments are split by hide existing Git commands are ignored. Arguments are split by
spaces, the usual shell quoting and escaping is supported. 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, If the alias expansion is prefixed with an exclamation point,
it will be treated as a shell command. For example, defining 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 files which are not currently tracked by Git. Directories which
contain only untracked files, are shown with the directory name contain only untracked files, are shown with the directory name
only. Showing untracked files means that Git needs to lstat() all 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 systems. So, this variable controls how the commands displays
the untracked files. Possible values are: the untracked files. Possible values are:
+ +