diff options
author | Junio C Hamano <junkio@cox.net> | 2006-03-05 22:38:22 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-05 22:38:22 -0800 |
commit | 3bcd59a546333ae355c87577ba63f8dccd50a519 (patch) | |
tree | 8a097c34b5a520ebe1189bdb2398c599148ffeb5 /Documentation/git-show-branch.txt | |
parent | Merge part of 'jc/pack' into 'next' (diff) | |
parent | Tweak asciidoc output to work with broken docbook-xsl (diff) | |
download | tgif-3bcd59a546333ae355c87577ba63f8dccd50a519.tar.xz |
Merge branch 'fd/asciidoc' into next
* fd/asciidoc:
Tweak asciidoc output to work with broken docbook-xsl
annotate-blame test: add evil merge.
annotate-blame test: don't "source", but say "."
annotate/blame tests updates.
annotate: Support annotation of files on other revisions.
git/Documentation: fix SYNOPSIS style bugs
blame: avoid "diff -u0".
git-blame: Use the same tests for git-blame as for git-annotate
blame and annotate: show localtime with timezone.
blame: avoid -lm by not using log().
git-blame: Make the output human readable
get_revision(): do not dig deeper when we know we are at the end.
documentation: add 'see also' sections to git-rm and git-add
contrib/emacs/Makefile: Provide tool for byte-compiling files.
gitignore: Ignore some more boring things.
Diffstat (limited to 'Documentation/git-show-branch.txt')
-rw-r--r-- | Documentation/git-show-branch.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 7b1a9c9875..e474cd0ba7 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -8,9 +8,9 @@ git-show-branch - Show branches and their commits. SYNOPSIS -------- [verse] -git-show-branch [--all] [--heads] [--tags] [--topo-order] [--current] - [--more=<n> | --list | --independent | --merge-base] - [--no-name | --sha1-name] [<rev> | <glob>]... +'git-show-branch' [--all] [--heads] [--tags] [--topo-order] [--current] + [--more=<n> | --list | --independent | --merge-base] + [--no-name | --sha1-name] [<rev> | <glob>]... DESCRIPTION ----------- |