diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-24 13:46:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 13:46:02 -0700 |
| commit | b9d14ffbf1f42eb80231d0378dd2f019a162c054 (patch) | |
| tree | 3634db48976a313913caad28a10787ac9bb54a9f /Documentation | |
| parent | t/test-lib.sh: Protect ourselves from common misconfiguration (diff) | |
| download | tgif-b9d14ffbf1f42eb80231d0378dd2f019a162c054.tar.xz | |
gitattributes documentation: clarify overriding
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index d2edb9b14a..857d55a409 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -49,10 +49,12 @@ Set to a value:: Unspecified:: No glob pattern matches the path, and nothing says if - the path has or does not have the attribute. + the path has or does not have the attribute, the + attribute for the path is said to be Unspecified. When more than one glob pattern matches the path, a later line -overrides an earlier line. +overrides an earlier line. This overriding is done per +attribute. When deciding what attributes are assigned to a path, git consults `$GIT_DIR/info/attributes` file (which has the highest @@ -215,7 +217,7 @@ String:: merge driver. The built-in 3-way merge driver can be explicitly specified by asking for "text" driver; the built-in "take the current branch" driver can be - requested by "binary". + requested with "binary". Defining a custom merge driver |