Documentation updates.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Oct 29, 2005 at 14:32 UTC
5773c9f2b28c3af92b7e9c6832536e99ab11cc78
3 files changed
+59
-7
Documentation/git-commit-tree.txt
+9
-2
@@ -48,8 +48,8 @@ A commit encapsulates:
48
- committer name and email and the commit time.
49
50
If not provided, "git-commit-tree" uses your name, hostname and domain to
51
-provide author and committer info. This can be overridden using the
52
-following environment variables.
51
+provide author and committer info. This can be overridden by
52
+either `.git/config` file, or using the following environment variables.
53
54
GIT_AUTHOR_NAME
55
GIT_AUTHOR_EMAIL
@@ -59,10 +59,17 @@ following environment variables.
59
60
(nb "<", ">" and "\n"s are stripped)
61
62
+In `.git/config` file, the following items are used:
63
+
64
+ [user]
65
+ name = "Your Name"
66
+ email = "your@email.address.xz"
67
+
68
A commit comment is read from stdin (max 999 chars). If a changelog
69
entry is not provided via "<" redirection, "git-commit-tree" will just wait
70
for one to be entered and terminated with ^D.
71
72
+
73
Diagnostics
74
-----------
75
You don't exist. Go away!::
Documentation/git-update-index.txt
+19
-5
@@ -9,12 +9,15 @@ git-update-index - Modifies the index or directory cache
9
SYNOPSIS
10
--------
11
'git-update-index'
12
- [--add] [--remove] [--refresh] [--replace]
13
- [--ignore-missing]
14
- [--force-remove]
12
+ [--add] [--remove] [--unmerged] [--refresh] [--replace]
13
[--cacheinfo <mode> <object> <file>]\*
14
+ [--chmod=(+|-)x]
15
[--info-only]
17
- [-z] [--stdin]
16
+ [--force-remove]
17
+ [--stdin]
18
+ [--index-info]
19
+ [--ignore-missing]
20
+ [-z]
21
[--] [<file>]\*
22
23
DESCRIPTION
@@ -79,7 +82,7 @@ OPTIONS
82
83
<file>::
84
Files to act on.
82
- Note that files begining with '.' are discarded. This includes
85
+ Note that files beginning with '.' are discarded. This includes
86
`./file` and `dir/./file`. If you don't want this, then use
87
cleaner names.
88
The same applies to directories ending '/' and paths with '//'
@@ -121,6 +124,17 @@ To update and refresh only the files already checked out:
124
git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh
125
126
127
+Configuration
128
+-------------
129
+
130
+The command honors `core.filemode` configuration variable. If
131
+your repository is on an filesystem whose executable bits are
132
+unreliable, this should be set to 'false'. This causes the
133
+command to ignore differences in file modes recorded in the
134
+index and the file mode on the filesystem if they differ only on
135
+executable bit. On such an unfortunate filesystem, you may
136
+need to use `git-update-index --chmod=`.
137
+
138
Author
139
------
140
Written by Linus Torvalds <torvalds@osdl.org>
Documentation/git.txt
+31
@@ -430,6 +430,37 @@ gitlink:gitk[1]::
430
gitk.
431
432
433
+Configuration Mechanism
434
+-----------------------
435
+
436
+Starting from 0.99.9 (actually mid 0.99.8.GIT), .git/config file
437
+is used to hold per-repository configuration options. It is a
438
+simple text file modelled after `.ini` format familiar to some
439
+people. Here is an example:
440
+
441
+------------
442
+#
443
+# This is the config file, and
444
+# a '#' or ';' character indicates
445
+# a comment
446
+#
447
+
448
+; core variables
449
+[core]
450
+ ; Don't trust file modes
451
+ filemode = false
452
+
453
+; user identity
454
+[user]
455
+ name = "Junio C Hamano"
456
+ email = "junkio@twinsun.com"
457
+
458
+------------
459
+
460
+Various commands read from the configuration file and adjust
461
+their operation accordingly.
462
+
463
+
464
Identifier Terminology
465
----------------------
466
<object>::