mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: builtin-fsck: fix off by one head count Documentation: let asciidoc align related options githooks.txt: add missing word builtin-commit.c: do not remove COMMIT_EDITMSG
This commit is contained in:
commit
78f111e12d
|
@ -21,7 +21,10 @@ OPTIONS
|
||||||
-------
|
-------
|
||||||
include::diff-options.txt[]
|
include::diff-options.txt[]
|
||||||
|
|
||||||
-1 -2 -3 or --base --ours --theirs, and -0::
|
-1 --base::
|
||||||
|
-2 --ours::
|
||||||
|
-3 --theirs::
|
||||||
|
-0::
|
||||||
Diff against the "base" version, "our branch" or "their
|
Diff against the "base" version, "our branch" or "their
|
||||||
branch" respectively. With these options, diffs for
|
branch" respectively. With these options, diffs for
|
||||||
merged entries are not shown.
|
merged entries are not shown.
|
||||||
|
|
|
@ -90,7 +90,7 @@ This hook is invoked by 'git-commit' right after preparing the
|
||||||
default log message, and before the editor is started.
|
default log message, and before the editor is started.
|
||||||
|
|
||||||
It takes one to three parameters. The first is the name of the file
|
It takes one to three parameters. The first is the name of the file
|
||||||
that the commit log message. The second is the source of the commit
|
that contains the commit log message. The second is the source of the commit
|
||||||
message, and can be: `message` (if a `-m` or `-F` option was
|
message, and can be: `message` (if a `-m` or `-F` option was
|
||||||
given); `template` (if a `-t` option was given or the
|
given); `template` (if a `-t` option was given or the
|
||||||
configuration option `commit.template` is set); `merge` (if the
|
configuration option `commit.template` is set); `merge` (if the
|
||||||
|
|
|
@ -624,7 +624,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
|
||||||
if (!commitable && !in_merge && !allow_empty &&
|
if (!commitable && !in_merge && !allow_empty &&
|
||||||
!(amend && is_a_merge(head_sha1))) {
|
!(amend && is_a_merge(head_sha1))) {
|
||||||
run_status(stdout, index_file, prefix, 0);
|
run_status(stdout, index_file, prefix, 0);
|
||||||
unlink(commit_editmsg);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -628,7 +628,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
||||||
}
|
}
|
||||||
|
|
||||||
heads = 0;
|
heads = 0;
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 0; i < argc; i++) {
|
||||||
const char *arg = argv[i];
|
const char *arg = argv[i];
|
||||||
if (!get_sha1(arg, head_sha1)) {
|
if (!get_sha1(arg, head_sha1)) {
|
||||||
struct object *obj = lookup_object(head_sha1);
|
struct object *obj = lookup_object(head_sha1);
|
||||||
|
|
Loading…
Reference in a new issue