Merge branch 'maint'
* maint: More fixes for 1.8.2.1 merge-tree: fix typo in merge-tree.c::unresolved git-commit doc: describe use of multiple `-m` options git-pull doc: fix grammo ("conflicts" is plural)
This commit is contained in:
commit
8617715cc0
@ -66,3 +66,6 @@ Fixes since v1.8.2
|
||||
to file scope static, but a few functions in graph.c were used by
|
||||
CGit from sideways bypassing the entry points of the API the
|
||||
in-tree users use.
|
||||
|
||||
* "git merge-tree" had a typo in the logic to detect d/f conflicts,
|
||||
which caused it to segfault in some cases.
|
||||
|
@ -137,6 +137,8 @@ OPTIONS
|
||||
-m <msg>::
|
||||
--message=<msg>::
|
||||
Use the given <msg> as the commit message.
|
||||
If multiple `-m` options are given, their values are
|
||||
concatenated as separate paragraphs.
|
||||
|
||||
-t <file>::
|
||||
--template=<file>::
|
||||
|
@ -218,7 +218,7 @@ $ git merge origin/next
|
||||
------------------------------------------------
|
||||
|
||||
|
||||
If you tried a pull which resulted in a complex conflicts and
|
||||
If you tried a pull which resulted in complex conflicts and
|
||||
would want to start over, you can recover with 'git reset'.
|
||||
|
||||
|
||||
|
@ -245,7 +245,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
|
||||
unsigned dirmask = 0, mask = 0;
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
mask |= (1 << 1);
|
||||
mask |= (1 << i);
|
||||
if (n[i].mode && S_ISDIR(n[i].mode))
|
||||
dirmask |= (1 << i);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user