delta/git.git/Documentation, branch jc/maint-pull-docfix-for-409b8d82

Documentation: exclude irrelevant options from "git pull"

2014-01-14T18:46:17+00:00

10eb64f5 (git pull manpage: don't include -n from fetch-options.txt,
2008-01-25) introduced a way to exclude some parts of included
source when building git-pull documentation, and later 409b8d82
(Documentation/git-pull: put verbosity options before merge/fetch
ones, 2010-02-24) attempted to use the mechanism to exclude some
parts of merge-options.txt when used from git-pull.txt.

However, the latter did not have an intended effect, because the
macro "git-pull" used to decide if the source is included in
git-pull documentation were defined a bit too late.

Define the macro before it is used to fix this.

Signed-off-by: Junio C Hamano

Documentation/git-pull: put verbosity options before merge/fetch ones

2010-02-24T16:35:43+00:00

After 3f7a9b5 (Documentation/git-pull.txt: Add subtitles above included
option files, Thu Oct 22 2009), the -q/-v options were mentioned only
for the merge options section, giving the impression that git-fetch did
not take those arguments.

Follow 90e4311 (git-pull: do not mention --quiet and --verbose twice,
Mon Sep 7 2009) and hide -q/-v for merge options, while mentioning -q/-v
before the merge- and fetch-specific options.

Signed-off-by: Tay Ray Chuan 
Signed-off-by: Junio C Hamano

Documentation/git-clone: mention progress in -v

2010-02-24T16:35:43+00:00

After 5a518ad (clone: use --progress to force progress reporting),
-v/--verbose did not affect whether progress status was reported to
stderr, and users accustomed to using -v to do so since 21188b1
(Implement git clone -v) may be confused.

Mitigate such risks by stating -v does not affect progress in the
documentation.

Signed-off-by: Tay Ray Chuan 
Signed-off-by: Junio C Hamano

Git 1.7.0

2010-02-12T23:45:05+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-02-12T23:40:59+00:00

* maint:
  Fix typo in 1.6.6.2 release notes
  Re-fix check-ref-format documentation mark-up

Fix typo in 1.6.6.2 release notes

2010-02-12T23:40:01+00:00

Of course, these are changes since 1.6.6.1; changes since 1.6.6.2
would have been nil.

Signed-off-by: Junio C Hamano

Re-fix check-ref-format documentation mark-up

2010-02-12T23:39:03+00:00

It is not double-backslash we forbid; backslashes are forbidden since
a4c2e699 (Disallow '\' in ref names, 2009-05-08)

Signed-off-by: Junio C Hamano

archive documentation: attributes are taken from the tree by default

2010-02-12T17:38:20+00:00

By default, git-archive takes attributes from the tree being archived.
People however often wonder why their attempts to affect the way how the
command archives their tree by changing .gitattributes in their work tree
fail.

Add a bit of explanatory note to tell them how to achieve what they want
to do.

Noticed-by: Francois Marier
Signed-off-by: Junio C Hamano

Documentation: minor fixes to RelNotes-1.7.0

2010-02-12T17:38:02+00:00

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

am: switch --resolved to --continue

2010-02-12T06:10:00+00:00

Rebase calls this same function "--continue", which means
users may be trained to type it. There is no reason to
deprecate --resolved (or -r), so we will keep it as a
synonym.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano