summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-21 20:03:53 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-21 20:03:53 -0700
commitfbf5df024e9137d446c5a85adeae7e4780365d1b (patch)
tree69e649ccbf7f457673d2f401956f54b20a7b5f2f /Documentation/config.txt
parent93d496a560cdcd4f72c8dee1b0b2efa324e1c3bb (diff)
parent523d12e5003eee0c2cb670b51e39d719cd56aacd (diff)
downloadgit-fbf5df024e9137d446c5a85adeae7e4780365d1b.tar.gz
Merge branch 'maint'
* maint: git-cvsserver: fix disabling service via per-method config git-status: respect core.excludesFile SubmittingPatches: mention older C compiler compatibility git-daemon: don't ignore pid-file write failure
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ee1c35e8eb..179cb177d1 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -256,6 +256,11 @@ You probably do not need to adjust this value.
+
Common unit suffixes of 'k', 'm', or 'g' are supported.
+core.excludeFile::
+ In addition to '.gitignore' (per-directory) and
+ '.git/info/exclude', git looks into this file for patterns
+ of files which are not meant to be tracked.
+
alias.*::
Command aliases for the gitlink:git[1] command wrapper - e.g.
after defining "alias.last = cat-file commit HEAD", the invocation