mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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:
Junio C Hamano
2013-03-27 10:58:07 -07:00
parent ccf23370aa 9a82efd0d2
commit 8617715cc0
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/RelNotes/1.8.2.1.txt
View File

@ -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.