Skip to content

Commit d97b0a0

Browse files
committed
Merge branch 'jc/doc-attr-tree' into seen
Make sure that "git --attr-source=X", GIT_ATTR_SOURCE, and attr.tree configuration variables appear at the same places in the documentation. * jc/doc-attr-tree: doc: give attr.tree a bit more visibility
2 parents eccbb7d + 50df963 commit d97b0a0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Documentation/git.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,10 @@ If you just want to run git as if it was started in `<path>` then use
228228
--attr-source=<tree-ish>::
229229
Read gitattributes from <tree-ish> instead of the worktree. See
230230
linkgit:gitattributes[5]. This is equivalent to setting the
231-
`GIT_ATTR_SOURCE` environment variable.
231+
`GIT_ATTR_SOURCE` environment variable. The `attr.tree`
232+
configuration variable is used as a fallback when this option
233+
or the environment variable are not in use.
234+
232235

233236
GIT COMMANDS
234237
------------

0 commit comments

Comments
 (0)