Commit Graph

8 Commits

Author SHA1 Message Date
Junio C Hamano
c9d023b2a6 Fix 'git-show-branch --list <head>'
It mistakenly failed to output anything when given a single head.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10 18:27:20 -07:00
Junio C Hamano
1f8af483df show-branch: --list and --independent
The --list option is what 'git branch' without parameter should
have been; it shows the one-line commit message for each branch
name.  The --independent option is used to filter out commits
that can be reachable from other commits, to make detection of
fast forward condition in multi-head merge easier.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-09 16:35:53 -07:00
Junio C Hamano
2f0f8b71ee Show all merge-base candidates from show-branch --merge-base
This would make things easier to use for Octopus.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-08 12:15:52 -07:00
Junio C Hamano
076b2324cd show-branch: make it work in a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30 19:19:02 -07:00
Junio C Hamano
8e5dd22b29 Updates: show-branch
Earlier show-branch gave names only to commits reachable via first
parent ancestry chain.  Change the naming code to name everybody.

The original idea was to stop at the first merge point in the
topological order, and --more=<n> to show commits until we show <n>
more extra merge points.  However depending on the order of how we
discover the commits, it additionally showed parents of the <n>th
merge points, which was unnecessary.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-29 17:19:47 -07:00
Junio C Hamano
628894b26d Sort branch names snarfed from refs/ hierarchy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-24 23:26:20 -07:00
Junio C Hamano
f5e375c9a9 Clean-up output from "git show-branch" and document it.
When showing only one branch a lot of default output becomes redundant,
so clean it up a bit, and document what is shown.  Retire the earlier
implementation "git-show-branches-script".

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-22 23:18:17 -07:00
Junio C Hamano
f76412ed6d [PATCH] Add 'git show-branch'.
The 'git show-branches' command turns out to be reasonably useful,
but painfully slow.  So rewrite it in C, using ideas from merge-base
while enhancing it a bit more.

 - Unlike show-branches, it can take --heads (show me all my
   heads), --tags (show me all my tags), or --all (both).

 - It can take --more=<number> to show beyond the merge-base.

 - It shows the short name for each commit in the extended SHA1
   syntax.

 - It can find merge-base for more than two heads.

Examples:

    $ git show-branch --more=6 HEAD

    is almost the same as "git log --pretty=oneline --max-count=6".

    $ git show-branch --merge-base master mhf misc

    finds the merge base of the three given heads.

    $ git show-branch master mhf misc

    shows logs from the top of these three branch heads, up to their
    common ancestor commit is shown.

    $ git show-branch --all --more=10

    is poor-man's gitk, showing all the tags and heads, and
    going back 10 commits beyond the merge base of those refs.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-22 18:34:10 -07:00