author | Junio C Hamano <gitster@pobox.com> | |
Fri, 3 Sep 2010 16:39:38 +0000 (09:39 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 3 Sep 2010 16:39:38 +0000 (09:39 -0700) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes-1.7.2.3.txt | patch | blob | history | |
Documentation/git.txt | patch | blob | history | |
builtin/merge-recursive.c | patch | blob | history |
index ef8059e6a8fae0ca19af49565e8ca4ee0ffb78a7..610960cfe120dbfae870c65ee72be0bb2c32eb16 100644 (file)
* "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 531789321c3b09f522f3284b736b8c65227c31b4..93e3b07c6cdf6c580cd7dff0d973478b91178481 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
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].
index d8875d589240e0c78a9e241a7d2bdde1d10ab800..3d00adbfc79aa0d5e4e6b3367bc5b70f8df36857 100644 (file)
#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];
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];