diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-04-10 00:47:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-10 00:47:04 -0700 |
| commit | 71349732c53a4c1b64729628b04db7b3c3f7606d (patch) | |
| tree | 22cd6c2ca4223b1a442400334958269ea1fac3ec /Documentation | |
| parent | Merge branch 'jc/rename' (diff) | |
| parent | git-fetch: fix status output when not storing tracking ref (diff) | |
| download | tgif-71349732c53a4c1b64729628b04db7b3c3f7606d.tar.xz | |
Merge branch 'maint'
* maint:
git-fetch: fix status output when not storing tracking ref
core-tutorial.txt: Fix showing the current behaviour.
git-archive: ignore prefix when checking file attribute
Fix documentation syntax of optional arguments in short options.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/core-tutorial.txt | 12 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index aa40dfd36a..5a5531222d 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -535,18 +535,18 @@ with the associated patches use the more complex (and much more powerful) ---------------- -$ git-whatchanged -p --root +$ git-whatchanged -p ---------------- and you will see exactly what has changed in the repository over its short history. [NOTE] -The `\--root` flag is a flag to `git-diff-tree` to tell it to -show the initial aka 'root' commit too. Normally you'd probably not -want to see the initial import diff, but since the tutorial project -was started from scratch and is so small, we use it to make the result -a bit more interesting. +When using the above two commands, the initial commit will be shown. +If this is a problem because it is huge, you can hide it by setting +the log.showroot configuration variable to false. Having this, you +can still show it for each command just adding the `\--root` option, +which is a flag for `git-diff-tree` accepted by both commands. With that, you should now be having some inkling of what git does, and can explore on your own. diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index c22fb71176..4b6fd90eaf 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <name> [<head>] 'git-tag' -d <name>... -'git-tag' [-n [<num>]] -l [<pattern>] +'git-tag' [-n[<num>]] -l [<pattern>] 'git-tag' -v <name>... DESCRIPTION @@ -57,7 +57,7 @@ OPTIONS -v:: Verify the gpg signature of the given tag names. --n <num>:: +-n<num>:: <num> specifies how many lines from the annotation, if any, are printed when using -l. The default is not to print any annotation lines. |