git-merge-base/git-show-branch: Cleanup documentation and usage
Make sure that usage strings and documentation coincide with each other and with the actual code. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Aug 5, 2009 at 09:59 UTC
995bdc73fe0e28d622af0897440f0ea298345585
4 files changed
+9
-7
Documentation/git-merge-base.txt
+3
-2
@@ -8,12 +8,12 @@ git-merge-base - Find as good common ancestors as possible for a merge
8
9
SYNOPSIS
10
--------
11
-'git merge-base' [--all] <commit> <commit>...
11
+'git merge-base' [-a|--all] <commit> <commit>...
12
13
DESCRIPTION
14
-----------
15
16
-'git-merge-base' finds best common ancestor(s) between two commits to use
16
+'git merge-base' finds best common ancestor(s) between two commits to use
17
in a three-way merge. One common ancestor is 'better' than another common
18
ancestor if the latter is an ancestor of the former. A common ancestor
19
that does not have any better common ancestor is a 'best common
@@ -29,6 +29,7 @@ the given two commits.
29
30
OPTIONS
31
-------
32
+-a::
33
--all::
34
Output all merge bases for the commits, instead of just one.
35
Documentation/git-show-branch.txt
+3
-2
@@ -8,11 +8,12 @@ git-show-branch - Show branches and their commits
8
SYNOPSIS
9
--------
10
[verse]
11
-'git show-branch' [--all] [--remotes] [--topo-order | --date-order]
12
- [--current] [--color | --no-color]
11
+'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]
12
+ [--current] [--color | --no-color] [--sparse]
13
[--more=<n> | --list | --independent | --merge-base]
14
[--no-name | --sha1-name] [--topics]
15
[<rev> | <glob>]...
16
+
17
'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]
18
19
DESCRIPTION
builtin-merge-base.c
+1
-1
@@ -23,7 +23,7 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
23
}
24
25
static const char * const merge_base_usage[] = {
26
- "git merge-base [--all] <commit-id> <commit-id>...",
26
+ "git merge-base [-a|--all] <commit> <commit>...",
27
NULL
28
};
29
builtin-show-branch.c
+2
-2
@@ -6,8 +6,8 @@
6
#include "parse-options.h"
7
8
static const char* show_branch_usage[] = {
9
- "git show-branch [--sparse] [--current] [--all] [--remotes] [--topo-order] [--more=count | --list | --independent | --merge-base] [--topics] [--color] [<refs>...]",
10
- "--reflog[=n[,b]] [--list] [--color] <branch>",
9
+ "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]...",
10
+ "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]",
11
NULL
12
};
13