Merge branch 'maint'

* maint:
  Documentation: update description of shell aliases
This commit is contained in:
Junio C Hamano 2009-07-08 10:42:23 -07:00
commit 26192bee8e

View File

@ -456,7 +456,9 @@ 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
"alias.new = !gitk --all --not ORIG_HEAD", the invocation "alias.new = !gitk --all --not ORIG_HEAD", the invocation
"git new" is equivalent to running the shell command "git new" is equivalent to running the shell command
"gitk --all --not ORIG_HEAD". "gitk --all --not ORIG_HEAD". Note that shell commands will be
executed from the top-level directory of a repository, which may
not necessarily be the current directory.
apply.whitespace:: apply.whitespace::
Tells 'git-apply' how to handle whitespaces, in the same way Tells 'git-apply' how to handle whitespaces, in the same way