From: Clemens Buchacher <drizzd@aon.at>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/2] Documentation: git-add does not update files marked "assume unchanged"
Date: Sat, 1 May 2010 11:27:20 +0200 [thread overview]
Message-ID: <20100501092720.GB15941@localhost> (raw)
In-Reply-To: <20100501092512.GA15941@localhost>
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
---
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
next prev parent reply other threads:[~2010-05-01 9:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-01 9:25 [PATCH 1/2] do not overwrite files marked "assume unchanged" Clemens Buchacher
2010-05-01 9:27 ` Clemens Buchacher [this message]
2010-05-04 8:57 ` update-index --really-refresh unsets assume-unchanged bit Clemens Buchacher
2010-05-04 16:41 ` Avery Pennarun
2010-05-04 19:41 ` Clemens Buchacher
2010-05-04 22:45 ` Junio C Hamano
2010-05-05 15:44 ` Clemens Buchacher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100501092720.GB15941@localhost \
--to=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.