diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-05 23:44:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-05 23:44:23 -0800 |
| commit | 22f741dab7cc93f00f7cf96cd65d7481677cd855 (patch) | |
| tree | b3b7a79303adbef3aa466dcbaa5cef9a1f48f318 /Documentation | |
| parent | 1127148089234a6f84754f2f0ec36cbbcae06fa9 (diff) | |
| download | git-22f741dab7cc93f00f7cf96cd65d7481677cd855.tar.gz git-22f741dab7cc93f00f7cf96cd65d7481677cd855.tar.xz | |
read-tree: document --exclude-per-directory
This documents the new option to read-tree that is used for the
improved "branch switching" code.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-read-tree.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 11bd9c0ad..0ff2890c7 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/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. |