git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Olaf Klischat <olaf.klischat@gmail.com>
To: git@vger.kernel.org, olaf@sofd.de
Cc: gitster@pobox.com
Subject: [PATCH 2/2] git-add: -s flag: documentation added
Date: Mon,  1 Oct 2012 09:15:00 +0200	[thread overview]
Message-ID: <1349075700-26334-3-git-send-email-olaf.klischat@gmail.com> (raw)
In-Reply-To: <1349075700-26334-1-git-send-email-olaf.klischat@gmail.com>

Signed-off-by: Olaf Klischat <olaf.klischat@gmail.com>
---
 Documentation/git-add.txt |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index fd9e36b..a5a1cd1 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -38,10 +38,12 @@ files have changes that are staged for the next commit.
 
 The `git add` command will not add ignored files by default.  If any
 ignored files were explicitly specified on the command line, `git add`
-will fail with a list of ignored files.  Ignored files reached by
-directory recursion or filename globbing performed by Git (quote your
-globs before the shell) will be silently ignored.  The 'git add' command can
-be used to add ignored files with the `-f` (force) option.
+will fail with a list of ignored files unless the `-s` (silent-ignore)
+option was given.  Ignored files reached by directory recursion or
+filename globbing performed by Git (quote your globs before the shell)
+will always be silently ignored.  The 'git add' command can be used to
+add ignored files with the `-f` (force) option (which is mutually
+exclusive with `-s`).
 
 Please see linkgit:git-commit[1] for alternative ways to add content to a
 commit.
@@ -69,6 +71,11 @@ OPTIONS
 --force::
 	Allow adding otherwise ignored files.
 
+-s::
+--silent-ignore::
+	Don't fail if ignored files were specified explicitly; ignore them
+	silently and continue.
+
 -i::
 --interactive::
 	Add modified contents in the working tree interactively to
-- 
1.7.10.4

  parent reply	other threads:[~2012-10-01  7:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-01  7:14 [PATCH 0/2] git-add: -s flag (silently ignore files) Olaf Klischat
2012-10-01  7:14 ` [PATCH 1/2] git-add: -s flag added " Olaf Klischat
2012-10-01 17:59   ` Junio C Hamano
2012-10-01 18:04     ` Matthieu Moy
2012-10-01  7:15 ` Olaf Klischat [this message]
2012-10-01 18:32 ` [PATCH 0/2] git-add: -s flag " Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1349075700-26334-3-git-send-email-olaf.klischat@gmail.com \
    --to=olaf.klischat@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=olaf@sofd.de \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).