diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-21 18:42:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-21 18:42:35 -0700 |
| commit | f95c6780c244e90abf87222126ad3b4bb18a504e (patch) | |
| tree | ede18dbb8b33e330f3837209a489f7737df2dc25 /Documentation/config.txt | |
| parent | 7df6ddf51ea71d81874ecfa34f670f50a3d45103 (diff) | |
| parent | 0ba956d331e4c14fb1600a62044492c6c27af71a (diff) | |
| download | git-f95c6780c244e90abf87222126ad3b4bb18a504e.tar.gz | |
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1:
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.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ea434af9db..4bbe1162cb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -263,6 +263,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 |