diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-10-11 15:22:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-11 15:22:48 -0700 |
| commit | 013f276eb78967f9742654ebde303c2fbe7a6cd6 (patch) | |
| tree | fa6ee220d23337f546a25daa2d8210f5d512cf2b /Documentation | |
| parent | Support custom build options in config.mak (diff) | |
| download | tgif-013f276eb78967f9742654ebde303c2fbe7a6cd6.tar.xz | |
show-branch: optionally use unique prefix as name.
git-show-branch acquires two new options. --sha1-name to name
commits using the unique prefix of their object names, and
--no-name to not to show names at all.
This was outlined in <7vk6gpyuyr.fsf@assigned-by-dhcp.cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-show-branch.txt | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index e0dce7ec12..c6c97b21c3 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -7,7 +7,7 @@ git-show-branch - Show branches and their commits. SYNOPSIS -------- -'git-show-branch [--all] [--heads] [--tags] [--more=<n> | --list | --independent | --merge-base] <reference>...' +'git-show-branch [--all] [--heads] [--tags] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] <reference>...' DESCRIPTION ----------- @@ -44,6 +44,15 @@ OPTIONS Among the <reference>s given, display only the ones that cannot be reached from any other <reference>. +--no-name:: + Do not show naming strings for each commit. + +--sha1-name:: + Instead of naming the commits using the path to reach + them from heads (e.g. "master~2" to mean the grandparent + of "master"), name them with the unique prefix of their + object names. + Note that --more, --list, --independent and --merge-base options are mutually exclusive. @@ -88,21 +97,6 @@ whose commit message is "Add 'git show-branch'. "fixes" branch adds one commit 'Introduce "reset type"'. "mhf" branch has many other commits. -When only one head is given, the output format changes slightly -to conserve space. The '+' sign to show which commit is -reachable from which head and the first N lines to show the list -of heads being displayed are both meaningless so they are -omitted. Also the label given to each commit does not repeat -the name of the branch because it is obvious. - ------------------------------------------------- -$ git show-branch --more=4 master -[master] Add 'git show-branch'. -[~1] Add a new extended SHA1 syntax <name>~<num> -[~2] Fix "git-diff A B" -[~3] git-ls-files: generalized pathspecs -[~4] Make "git-ls-files" work in subdirectories ------------------------------------------------- Author ------ |