diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:39:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:39:38 -0700 |
| commit | 22ffc39a0332e892ddbf16b39d9b611aff238d9b (patch) | |
| tree | 90ed6d2bc6afd2a3867c2bdd770f951baa3014d6 | |
| parent | 4bf9dd97827bf6f475a52e8f621dad24a3db9b4c (diff) | |
| parent | dd34b6be8a3e869f3e0d62a13115f02d90cf4f80 (diff) | |
| download | git-22ffc39a0332e892ddbf16b39d9b611aff238d9b.tar.gz | |
Sync with 1.7.2.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes-1.7.2.3.txt | 7 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rw-r--r-- | builtin/merge-recursive.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/Documentation/RelNotes-1.7.2.3.txt b/Documentation/RelNotes-1.7.2.3.txt index ef8059e6a8..610960cfe1 100644 --- a/Documentation/RelNotes-1.7.2.3.txt +++ b/Documentation/RelNotes-1.7.2.3.txt @@ -37,10 +37,3 @@ Fixes since v1.7.2.2 * "git pack-refs --all --prune" did not remove a directory that has become empty. - ---- -exec >/var/tmp/1 -echo O=$(git describe maint) -O=v1.7.2.2 -git shortlog --no-merges $O..maint -exit 0 diff --git a/Documentation/git.txt b/Documentation/git.txt index 531789321c..93e3b07c6c 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.2.2/git.html[documentation for release 1.7.2.2] +* link:v1.7.2.3/git.html[documentation for release 1.7.2.3] * release notes for + link:RelNotes-1.7.2.3.txt[1.7.2.3], link:RelNotes-1.7.2.2.txt[1.7.2.2], link:RelNotes-1.7.2.1.txt[1.7.2.1], link:RelNotes-1.7.2.txt[1.7.2]. diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index d8875d5892..3d00adbfc7 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -3,6 +3,9 @@ #include "tag.h" #include "merge-recursive.h" +static const char builtin_merge_recursive_usage[] = + "git %s <base>... -- <head> <remote> ..."; + static const char *better_branch_name(const char *branch) { static char githead_env[8 + 40 + 1]; @@ -29,7 +32,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) o.subtree_shift = ""; if (argc < 4) - usagef("%s <base>... -- <head> <remote> ...", argv[0]); + usagef(builtin_merge_recursive_usage, argv[0]); for (i = 1; i < argc; ++i) { const char *arg = argv[i]; |