diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
commit | e7935c49199b7d60c02043382b62ce70d36017e9 (patch) | |
tree | 280d09d89444d318008e632fbb9c9d88a393cacf /git-read-tree.txt | |
parent | 3f403b04bd95096f37297ab2cfbd4ad1f6dbb904 (diff) | |
download | git-htmldocs-e7935c49199b7d60c02043382b62ce70d36017e9.tar.gz |
Autogenerated HTML docs for v1.4.4.2-g1d77
Diffstat (limited to 'git-read-tree.txt')
-rw-r--r-- | git-read-tree.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/git-read-tree.txt b/git-read-tree.txt index 11bd9c0ad..0ff2890c7 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index SYNOPSIS -------- -'git-read-tree' (<tree-ish> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]]) +'git-read-tree' (<tree-ish> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] <tree-ish1> [<tree-ish2> [<tree-ish3>]]) DESCRIPTION @@ -71,6 +71,20 @@ OPTIONS directory. Note that the `<prefix>/` value must end with a slash. +--exclude-per-directory=<gitignore>:: + When running the command with `-u` and `-m` options, the + merge result may need to overwrite paths that are not + tracked in the current branch. The command usually + refuses to proceed with the merge to avoid losing such a + path. However this safety valve sometimes gets in the + way. For example, it often happens that the other + branch added a file that used to be a generated file in + your branch, and the safety valve triggers when you try + to switch to that branch after you ran `make` but before + running `make clean` to remove the generated file. This + option tells the command to read per-directory exclude + file (usually '.gitignore') and allows such an untracked + but explicitly ignored file to be overwritten. <tree-ish#>:: The id of the tree object(s) to be read/merged. |