diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-03 23:31:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 23:34:22 -0800 |
| commit | 632ac9fd12a2d4ff2c1a1fcd63492ce24315221f (patch) | |
| tree | 54f5a53cc156c661fdf5202a4419fbc97cab8f3d | |
| parent | dc9195ac7830bdf08ee847ef6a385c0b8f673d69 (diff) | |
| download | git-632ac9fd12a2d4ff2c1a1fcd63492ce24315221f.tar.gz | |
show-branch -g: default to the current branch.
Now we have a separate reflog on HEAD, show-branch -g without an explicit
parameter defaults to the current branch, or HEAD when it is detached
from branches.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-show-branch.txt | 8 | ||||
| -rw-r--r-- | builtin-show-branch.c | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index b38633c397..ba5313d51f 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -11,7 +11,7 @@ SYNOPSIS 'git-show-branch' [--all] [--remotes] [--topo-order] [--current] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]... -'git-show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] <ref> +'git-show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>] DESCRIPTION ----------- @@ -97,11 +97,13 @@ OPTIONS will show the revisions given by "git rev-list {caret}master topic1 topic2" ---reflog[=<n>[,<base>]] <ref>:: +--reflog[=<n>[,<base>]] [<ref>]:: Shows <n> most recent ref-log entries for the given ref. If <base> is given, <n> entries going back from that entry. <base> can be specified as count or date. - `-g` can be used as a short-hand for this option. + `-g` can be used as a short-hand for this option. When + no explicit <ref> parameter is given, it defaults to the + current branch (or `HEAD` if it is detached). Note that --more, --list, --independent and --merge-base options are mutually exclusive. diff --git a/builtin-show-branch.c b/builtin-show-branch.c index fa62e487b1..0d94e40df8 100644 --- a/builtin-show-branch.c +++ b/builtin-show-branch.c @@ -690,7 +690,10 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) if (ac == 0) { static const char *fake_av[2]; - fake_av[0] = "HEAD"; + const char *refname; + + refname = resolve_ref("HEAD", sha1, 1, NULL); + fake_av[0] = xstrdup(refname); fake_av[1] = NULL; av = fake_av; ac = 1; |