X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-read-tree.txt;h=0ff2890c7fb76155e08eaf9e361bf1eb6cf50f25;hb=3a81b9f571a6b7edd83b3d5f27c3c95d9b1c9d5c;hp=1c01d00df2d46e7d2eaefae835e22a3b4724e8e8;hpb=9c41a17ca22015c70008245911fc7674b59c5e9d;p=git.git diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 1c01d00df..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' ( | [[-m [--aggressive] | --reset | --prefix=] [-u | -i]] [ []]) +'git-read-tree' ( | [[-m [--aggressive] | --reset | --prefix=] [-u | -i]] [--exclude-per-directory=] [ []]) DESCRIPTION @@ -71,6 +71,20 @@ OPTIONS directory. Note that the `/` value must end with a slash. +--exclude-per-directory=:: + 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. :: The id of the tree object(s) to be read/merged. @@ -266,7 +280,7 @@ file that does not match stage 2. This is done to prevent you from losing your work-in-progress changes, and mixing your random changes in an unrelated merge commit. To illustrate, suppose you start from what has been -commited last to your repository: +committed last to your repository: ---------------- $ JC=`git-rev-parse --verify "HEAD^0"`