diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:58:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:58:07 -0700 |
| commit | 8617715cc09b7422fe31189f9476f6ade73ede70 (patch) | |
| tree | 7c62d215a31c9e990753b2bc1e8aee1870f06c4c /Documentation/RelNotes | |
| parent | Merge branch 'master' of git://git.bogomips.org/git-svn (diff) | |
| parent | More fixes for 1.8.2.1 (diff) | |
| download | tgif-8617715cc09b7422fe31189f9476f6ade73ede70.tar.xz | |
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)
Diffstat (limited to 'Documentation/RelNotes')
| -rw-r--r-- | Documentation/RelNotes/1.8.2.1.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt index 23977562a9..b4cf3cccde 100644 --- a/Documentation/RelNotes/1.8.2.1.txt +++ b/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. |