summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-07-08 17:42:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-08 17:42:23 (GMT)
commit26192bee8e632e27d361d0d67a6e2a544fb1489b (patch)
tree3313ae809c8121b9a06bf7eb1d0abb7c7caf4770 /Documentation/config.txt
parentf581de1b7b9d17c83b188bf8ffe536fb8a9dd2a4 (diff)
parent49902bd8561392e979c54344ae98dfab7a7ecf05 (diff)
downloadgit-26192bee8e632e27d361d0d67a6e2a544fb1489b.zip
git-26192bee8e632e27d361d0d67a6e2a544fb1489b.tar.gz
git-26192bee8e632e27d361d0d67a6e2a544fb1489b.tar.bz2
Merge branch 'maint'
* maint: Documentation: update description of shell aliases
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2fecbe3..bf97e1d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -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
"alias.new = !gitk --all --not ORIG_HEAD", the invocation
"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::
Tells 'git-apply' how to handle whitespaces, in the same way