delta/git.git/Documentation/git-add.txt, branch jk/robustify-parse-commit

git add: --ignore-removal is a better named --no-all

2013-04-22T20:34:31+00:00

In the historical context of "git add --all ." that pays attention
to "all kinds of changes" (implying "without ignoring removals"),
the option to countermand it "--no-all" may have made sense, but
because we will be making "--all" the default when a pathspec is
given, it makes more sense to rename the option to a more explicit
"--ignore-removal".  The "--all" option naturally becomes its
negation, "--no-ignore-removal".

Signed-off-by: Junio C Hamano

git add: start preparing for "git add ..." to default to "-A"

2013-03-09T07:26:56+00:00

When "git add subdir/" is run without "-u" or "-A" option, e.g.

    $ edit subdir/x
    $ create subdir/y
    $ rm subdir/z
    $ git add subdir/

the command does not notice removal of paths (e.g. subdir/z) from
the working tree.  This sometimes confuses new people, as arguably
"git add" is told to record the current state of "subdir/" as a
whole, not the current state of the paths that exist in the working
tree that matches that pathspec (the latter by definition excludes
the state of "subdir/z" because it does not exist in the working
tree).

Plan to eventually make "git add" pretend as if "-A" is given when
there is a pathspec on the command line.  When resolving a conflict
to remove a path, the current code tells you to "git rm $path", but
with such a change, you will be able to say "git add $path" (of
course you can do "git add -A $path" today).  That means that we can
simplify the advice messages given by "git status".  That all will
be in Git 2.0 or later, if we are going to do so.

For that transition to work, people need to learn either to say "git
add --no-all subdir/" when they want to ignore the removed paths
like "subdir/z", or to say "git add -A subdir/" when they want to
take the state of the directory as a whole.

"git add" without any argument will continue to be a no-op.

Signed-off-by: Junio C Hamano

add: Clarify documentation of -A and -u

2013-03-07T19:16:54+00:00

The documentation of '-A' and '-u' is very confusing for someone who
doesn't already know what they do.  Describe them with fewer words and
clearer parallelism to each other and to the behavior of plain 'add'.

Also mention the default  for '-A' as well as '-u', because
it applies to both.

Signed-off-by: Greg Price 
Signed-off-by: Junio C Hamano

Documentation/git-add: kill remaining

2013-02-14T23:51:43+00:00

The merge at 5bf72ed2 missed another instance of  that
we were converting to .

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2013-02-12T20:23:12+00:00

* maint:
  Replace filepattern with pathspec for consistency

Replace filepattern with pathspec for consistency

2013-02-12T18:05:38+00:00

pathspec is the most widely used term, and is the one defined in
gitglossary.txt.  was used only in the synopsys for git-add
and git-commit, and in git-add.txt. Get rid of it.

This patch is obtained with by running:

  perl -pi -e 's/filepattern/pathspec/' `git grep -l filepattern`

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

add: warn when -u or -A is used without pathspec

2013-01-28T18:31:35+00:00

Most Git commands that can be used with or without pathspec operate
tree-wide by default, the pathspec being used to restrict their
scope.  A few exceptions are: 'git grep', 'git clean', 'git add -u'
and 'git add -A'.  When run in a subdirectory without pathspec, they
operate only on paths in the current directory.

The inconsistency of 'git add -u' and 'git add -A' is particularly
problematic since other 'git add' subcommands (namely 'git add -p'
and 'git add -e') are tree-wide by default.  It also means that "git
add -u && git commit" will record a state that is different from
what is recorded with "git commit -a".

Flipping the default now is unacceptable, so let's start training
users to type 'git add -u|-A :/' or 'git add -u|-A .' explicitly, to
prepare for the next steps:

* forbid 'git add -u|-A' without pathspec (like 'git add' without
  option)

* much later, maybe, re-allow 'git add -u|-A' without pathspec, that
  will add all tracked and modified files, or all files, tree-wide.

A nice side effect of this patch is that it makes the :/ magic
pathspec easier to discover for users.

When the command is called from the root of the tree, there is no
ambiguity and no need to change the behavior, hence no need to warn.

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

Doc add: link gitignore

2012-09-19T04:49:46+00:00

Use a gitignore link rather than the gitrepository-
layout link.

Signed-off-by: Philip Oakley 
Signed-off-by: Junio C Hamano

Merge branch 'vh/config-interactive-singlekey-doc'

2011-05-11T18:38:06+00:00

* vh/config-interactive-singlekey-doc:
  git-reset.txt: better docs for '--patch'
  git-checkout.txt: better docs for '--patch'
  git-stash.txt: better docs for '--patch'
  git-add.txt: document 'interactive.singlekey'
  config.txt: 'interactive.singlekey; is used by...

git-add.txt: document 'interactive.singlekey'

2011-05-05T19:43:11+00:00

This is documented in the section about the 'Interactive Mode', rather than for
the option '--patch', since this is the section is where people go to learn
about '--patch'.

Helped-by: Jeff King 
Mentored-by: Junio C Hamano 
Signed-off-by: Valentin Haenel 
Signed-off-by: Junio C Hamano