Signed-off-by: Clemens Buchacher <drizzd@xxxxxx> --- Behavior of git-add also changed since commit 1dcafcc0, but I actually prefer it this way. Documentation/git-update-index.txt | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 68dc187..2d45774 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -93,8 +93,6 @@ OPTIONS This option can be also used as a coarse file-level mechanism to ignore uncommitted changes in tracked files (akin to what `.gitignore` does for untracked files). -You should remember that an explicit 'git add' operation will -still cause the file to be refreshed from the working tree. Git will fail (gracefully) in case it needs to modify this file in the index e.g. when merging in a commit; thus, in case the assumed-untracked file is changed upstream, @@ -102,7 +100,8 @@ you will need to handle the situation manually. --really-refresh:: Like '--refresh', but checks stat information unconditionally, - without regard to the "assume unchanged" setting. + without regard to the "assume unchanged" setting. The "assume + unchanged" bit is unset for all paths. --skip-worktree:: --no-skip-worktree:: -- 1.7.0.5.3.ga76e -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html