diff options
| author | Wincent Colaiuta <win@wincent.com> | 2009-03-25 19:23:42 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-25 17:28:33 -0700 |
| commit | 4fa535a179e771cd5a16d5ab05e97e7bb52739ef (patch) | |
| tree | 8d304c37da17dc14a356b2e460b69fd012353386 | |
| parent | 98e1a4186acd4b71da1daae5c522cb6ac6d1d904 (diff) | |
| download | git-4fa535a179e771cd5a16d5ab05e97e7bb52739ef.tar.gz git-4fa535a179e771cd5a16d5ab05e97e7bb52739ef.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-merge.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-patch-id.txt | 2 | ||||
| -rw-r--r-- | Documentation/merge-strategies.txt | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index cc0d30fe7..427ad9083 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -41,7 +41,7 @@ include::merge-strategies.txt[] If you tried a merge which resulted in a complex conflicts and -would want to start over, you can recover with 'git-reset'. +want to start over, you can recover with 'git-reset'. CONFIGURATION ------------- diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index 477785e13..253fc0fc2 100644 --- a/Documentation/git-patch-id.txt +++ b/Documentation/git-patch-id.txt @@ -20,7 +20,7 @@ IOW, you can use this thing to look for likely duplicate commits. When dealing with 'git-diff-tree' output, it takes advantage of the fact that the patch is prefixed with the object name of the -commit, and outputs two 40-byte hexadecimal string. The first +commit, and outputs two 40-byte hexadecimal strings. The first string is the patch ID, and the second string is the commit ID. This can be used to make a mapping from patch ID to commit ID. diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 1276f858a..4365b7e84 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -3,15 +3,15 @@ MERGE STRATEGIES resolve:: This can only resolve two heads (i.e. the current branch - and another branch you pulled from) using 3-way merge + and another branch you pulled from) using a 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities and is considered generally safe and fast. recursive:: - This can only resolve two heads using 3-way merge - algorithm. When there are more than one common - ancestors that can be used for 3-way merge, it creates a + This can only resolve two heads using a 3-way merge + algorithm. When there is more than one common + ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without @@ -22,11 +22,11 @@ recursive:: pulling or merging one branch. octopus:: - This resolves more than two-head case, but refuses to do - complex merge that needs manual resolution. It is + This resolves cases with more than two heads, but refuses to do + a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when - pulling or merging more than one branches. + pulling or merging more than one branch. ours:: This resolves any number of heads, but the result of the |