From 38ef8a76e7c8c3e1be6e6ae96cfccc4191e9eac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihai=20Capot=C4=83?= Date: Wed, 27 Mar 2013 12:04:51 +0100 Subject: [PATCH 1/4] git-pull doc: fix grammo ("conflicts" is plural) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mihai Capotă Signed-off-by: Junio C Hamano --- Documentation/git-pull.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 67fa5ee1952..638456b68c1 100644 --- a/Documentation/git-pull.txt +++ b/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'. From 6bf6366cc6ac3de57ddb77e653d246aba333973d Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Wed, 27 Mar 2013 15:19:35 +0100 Subject: [PATCH 2/4] git-commit doc: describe use of multiple `-m` options The text is copied from Documentation/git-tag.txt. Signed-off-by: Christian Helmuth Signed-off-by: Junio C Hamano --- Documentation/git-commit.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 7bdb039d5ee..21056381919 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -137,6 +137,8 @@ OPTIONS -m :: --message=:: Use the given as the commit message. + If multiple `-m` options are given, their values are + concatenated as separate paragraphs. -t :: --template=:: From 187c00c6c58ba8916a37011b56cb0cb8f2dd1805 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Wed, 27 Mar 2013 15:58:50 +0000 Subject: [PATCH 3/4] merge-tree: fix typo in merge-tree.c::unresolved When calculating whether there is a d/f conflict, the calculation of whether both sides are directories generates an incorrect references mask because it does not use the loop index to set the correct bit. Fix this typo. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano --- builtin/merge-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index e0d0b7d28b9..bc912e399ef 100644 --- a/builtin/merge-tree.c +++ b/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); } From 9a82efd0d2a2727507bd908d7f0545437fcc0ff6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 27 Mar 2013 10:57:57 -0700 Subject: [PATCH 4/4] More fixes for 1.8.2.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.2.1.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt index 23977562a93..b4cf3cccde5 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.