Grammar fixes to "merge" and "patch-id" docs
Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Wincent Colaiuta committed
Mar 25, 2009 at 19:23 UTC
4fa535a179e771cd5a16d5ab05e97e7bb52739ef
3 files changed
+9
-9
Documentation/git-merge.txt
+1
-1
@@ -41,7 +41,7 @@ include::merge-strategies.txt[]
41
42
43
If you tried a merge which resulted in a complex conflicts and
44
-would want to start over, you can recover with 'git-reset'.
44
+want to start over, you can recover with 'git-reset'.
45
46
CONFIGURATION
47
-------------
Documentation/git-patch-id.txt
+1
-1
@@ -20,7 +20,7 @@ IOW, you can use this thing to look for likely duplicate commits.
20
21
When dealing with 'git-diff-tree' output, it takes advantage of
22
the fact that the patch is prefixed with the object name of the
23
-commit, and outputs two 40-byte hexadecimal string. The first
23
+commit, and outputs two 40-byte hexadecimal strings. The first
24
string is the patch ID, and the second string is the commit ID.
25
This can be used to make a mapping from patch ID to commit ID.
26
Documentation/merge-strategies.txt
+7
-7
@@ -3,15 +3,15 @@ MERGE STRATEGIES
3
4
resolve::
5
This can only resolve two heads (i.e. the current branch
6
- and another branch you pulled from) using 3-way merge
6
+ and another branch you pulled from) using a 3-way merge
7
algorithm. It tries to carefully detect criss-cross
8
merge ambiguities and is considered generally safe and
9
fast.
10
11
recursive::
12
- This can only resolve two heads using 3-way merge
13
- algorithm. When there are more than one common
14
- ancestors that can be used for 3-way merge, it creates a
12
+ This can only resolve two heads using a 3-way merge
13
+ algorithm. When there is more than one common
14
+ ancestor that can be used for 3-way merge, it creates a
15
merged tree of the common ancestors and uses that as
16
the reference tree for the 3-way merge. This has been
17
reported to result in fewer merge conflicts without
@@ -22,11 +22,11 @@ recursive::
22
pulling or merging one branch.
23
24
octopus::
25
- This resolves more than two-head case, but refuses to do
26
- complex merge that needs manual resolution. It is
25
+ This resolves cases with more than two heads, but refuses to do
26
+ a complex merge that needs manual resolution. It is
27
primarily meant to be used for bundling topic branch
28
heads together. This is the default merge strategy when
29
- pulling or merging more than one branches.
29
+ pulling or merging more than one branch.
30
31
ours::
32
This resolves any number of heads, but the result of the