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 | |
| parent | 7df6ddf51ea71d81874ecfa34f670f50a3d45103 (diff) | |
| parent | 0ba956d331e4c14fb1600a62044492c6c27af71a (diff) | |
| download | git-f95c6780c244e90abf87222126ad3b4bb18a504e.tar.gz git-f95c6780c244e90abf87222126ad3b4bb18a504e.tar.xz | |
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')
| -rw-r--r-- | Documentation/SubmittingPatches | 13 | ||||
| -rw-r--r-- | Documentation/config.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-status.txt | 5 |
3 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 6a4da2ddd..b94d9a816 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -65,6 +65,19 @@ in templates/hooks--pre-commit. To help ensure this does not happen, run git diff --check on your changes before you commit. +(1a) Try to be nice to older C compilers + +We try to support wide range of C compilers to compile +git with. That means that you should not use C99 initializers, even +if a lot of compilers grok it. + +Also, variables have to be declared at the beginning of the block +(you can check this with gcc, using the -Wdeclaration-after-statement +option). + +Another thing: NULL pointers shall be written as NULL, not as 0. + + (2) Generate your patch using git tools out of your commits. git based diff tools (git, Cogito, and StGIT included) generate diff --git a/Documentation/config.txt b/Documentation/config.txt index ea434af9d..4bbe1162c 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 diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index e9e193f00..d7015387b 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -42,6 +42,11 @@ mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output. +As for gitlink:git-add[1], the configuration variable +'core.excludesfile' can indicate a path to a file containing patterns +of file names to exclude, in addition to patterns given in +'info/exclude' and '.gitignore'. + Author ------ |