Browse files

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)
  • Loading branch information...
2 parents ccf2337 + 9a82efd commit 8617715cc09b7422fe31189f9476f6ade73ede70 @gitster gitster committed Mar 27, 2013
Showing with 7 additions and 2 deletions.
  1. +3 −0 Documentation/RelNotes/1.8.2.1.txt
  2. +2 −0 Documentation/git-commit.txt
  3. +1 −1 Documentation/git-pull.txt
  4. +1 −1 builtin/merge-tree.c
View
3 Documentation/RelNotes/1.8.2.1.txt
@@ -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.
View
2 Documentation/git-commit.txt
@@ -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>::
View
2 Documentation/git-pull.txt
@@ -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'.
View
2 builtin/merge-tree.c
@@ -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);
}

0 comments on commit 8617715

Please sign in to comment.