Sync with 1.7.2.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
commit
22ffc39a03
@ -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
|
||||
|
@ -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].
|
||||
|
@ -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];
|
||||
|
Loading…
Reference in New Issue
Block a user