Re: [PATCH] add: Clarify documentation of -A and -u

2013-03-07 Thread Greg Price
an entry matching . This removes as well as modifies index entries to match the working tree, but adds no new files. -A:: --all:: Update the index not only where the working tree has a file matching but also where the index already has an entry. This adds,

[PATCH] add: Clarify documentation of -A and -u

2013-03-05 Thread Greg Price
it directly (and in a way that uses the word 'all'), and then describe the contrast separately. Signed-off-by: Greg Price --- Documentation/git-add.txt | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Documentation/git-add.txt b/Documentation/gi

[PATCH] add: cut redundant require_pathspec logic

2013-03-05 Thread Greg Price
If take_worktree_changes is true, then the logic around option_with_implicit_dot ensures argc is positive by this point. So require_pathspec never has an effect. Signed-off-by: Greg Price --- builtin/add.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/builtin/add.c b

Re: [PATCH 2/2] describe: Exclude --all --match=PATTERN

2013-03-03 Thread Greg Price
On Sun, Mar 03, 2013 at 01:15:21PM -0800, Junio C Hamano wrote: > Greg Price writes: > > It seems to me that "--all" says two things: > > > > (a) allow unannotated (rather than only annotated) > > > > (b) allow refs of any name (rather than only

Re: [PATCH 2/2] describe: Exclude --all --match=PATTERN

2013-03-03 Thread Greg Price
they may be confused, and if the command line was generated, perhaps called from a script, then I fear a bug in the script is likely, what with the conflicting expectations expressed by "--all" and "--match". Patch below to suggest "--tags" in the error message. Greg >F

[PATCH 2/2] describe: Exclude --all --match=PATTERN

2013-02-24 Thread Greg Price
oxymoron anyway, so just forbid it. Signed-off-by: Greg Price --- This should be applied after the preceding patch; I mistakenly omitted the '1/2' in its subject line. Documentation/git-describe.txt | 3 ++- builtin/describe.c | 3 +++ 2 files changed, 5 insertions(+),

[PATCH] Fix ".git/refs" stragglers

2013-02-24 Thread Greg Price
A couple of references still survive to .git/refs as a tree of all refs. Fix one in docs, one in a -h message, one in a -h message quoted in docs. Signed-off-by: Greg Price --- Documentation/config.txt | 2 +- Documentation/gitcli.txt | 9 + builtin/describe.c | 4 ++-- 3 files

[PATCH] describe: Document --match pattern format

2013-02-24 Thread Greg Price
It's not clear in git-describe(1) what kind of "pattern" should be passed to --match. Fix that. Signed-off-by: Greg Price --- Documentation/git-describe.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-describe.txt b/Documentation/g

[PATCH] Small grammar fix

2013-02-24 Thread Greg Price
advices which shows "advices" is <1/100 as common as "advice".) Signed-off-by: Greg Price --- Documentation/config.txt | 2 +- t/t7512-status-help.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt in