aboutsummaryrefslogtreecommitdiff
path: root/Documentation
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
parent93d496a560cdcd4f72c8dee1b0b2efa324e1c3bb (diff)
parent523d12e5003eee0c2cb670b51e39d719cd56aacd (diff)
downloadgit-fbf5df024e9137d446c5a85adeae7e4780365d1b.tar.gz
git-fbf5df024e9137d446c5a85adeae7e4780365d1b.tar.xz
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')
-rw-r--r--Documentation/SubmittingPatches13
-rw-r--r--Documentation/config.txt5
-rw-r--r--Documentation/git-status.txt5
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 ee1c35e8e..179cb177d 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
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
------