Re: [PATCH 3/2] git add <pathspec>... defaults to "-A"
On Mon, Apr 22, 2013 at 6:41 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 16 quoted lines
> diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
> index 48754cb..77ad391 100644
> --- a/Documentation/git-add.txt
> +++ b/Documentation/git-add.txt
> @@ -53,8 +53,14 @@ OPTIONS
> Files to add content from. Fileglobs (e.g. `*.c`) can
> be given to add all matching files. Also a
> leading directory name (e.g. `dir` to add `dir/file1`
> - and `dir/file2`) can be given to add all files in the
> - directory, recursively.
> + and `dir/file2`) can be given to update the index to
> + match the current state of the directory as a whole (e.g.
> + specifying `dir` will record not just a file `dir/file1`
> + modified in the working tree, a file `dir/file2` added to
> + the working tree, but also a file `dir/file3` removed from
> + the working tree. Note that older versions of Git used
Show 17 quoted lines
> + to ignore removed files; use `--no-all` option if you want
> + to add modified or new files but ignore removed ones.
>
> -n::
> --dry-run::
> @@ -129,11 +135,9 @@ of Git, hence the form without <pathspec> should not be used.
> files that have been removed from the working tree. This
> option is a no-op when no <pathspec> is used.
> +
> -This option is primarily to help the current users of Git, whose
> -"git add <pathspec>..." ignores removed files. In future versions
> -of Git, "git add <pathspec>..." will be a synonym to "git add -A
> -<pathspec>..." and "git add --ignore-removal <pathspec>..." will behave like
> -today's "git add <pathspec>...", ignoring removed files.
> +This option is primarily to help users who are used to older
> +versions of Git, whose "git add <pathspec>..." was a synonym
> +to "git add --no-all <pathspec>...", i.e. ignored removed files.
>
> -N::
> --intent-to-add::