undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Grammar fixes to "merge" and "patch-id" docs

Browse Source 
Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Wincent Colaiuta 2009-03-25 19:23:42 +01:00 committed by Junio C Hamano
parent 98e1a4186a
commit 4fa535a179
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-merge.txt
View File

@ -41,7 +41,7 @@ include::merge-strategies.txt[]
If you tried a merge which resulted in a complex conflicts and 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 CONFIGURATION
------------- -------------

2
Documentation/git-patch-id.txt
View File

@ -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 When dealing with 'git-diff-tree' output, it takes advantage of
the fact that the patch is prefixed with the object name of the 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. 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. This can be used to make a mapping from patch ID to commit ID.

14
Documentation/merge-strategies.txt
View File

@ -3,15 +3,15 @@ MERGE STRATEGIES
resolve:: resolve::
This can only resolve two heads (i.e. the current branch 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 algorithm. It tries to carefully detect criss-cross
merge ambiguities and is considered generally safe and merge ambiguities and is considered generally safe and
fast. fast.
recursive:: recursive::
This can only resolve two heads using 3-way merge This can only resolve two heads using a 3-way merge
algorithm. When there are more than one common algorithm. When there is more than one common
ancestors that can be used for 3-way merge, it creates a ancestor that can be used for 3-way merge, it creates a
merged tree of the common ancestors and uses that as merged tree of the common ancestors and uses that as
the reference tree for the 3-way merge. This has been the reference tree for the 3-way merge. This has been
reported to result in fewer merge conflicts without reported to result in fewer merge conflicts without
@ -22,11 +22,11 @@ recursive::
pulling or merging one branch. pulling or merging one branch.
octopus:: octopus::
This resolves more than two-head case, but refuses to do This resolves cases with more than two heads, but refuses to do
complex merge that needs manual resolution. It is a complex merge that needs manual resolution. It is
primarily meant to be used for bundling topic branch primarily meant to be used for bundling topic branch
heads together. This is the default merge strategy when heads together. This is the default merge strategy when
pulling or merging more than one branches. pulling or merging more than one branch.
ours:: ours::
This resolves any number of heads, but the result of the This resolves any number of heads, but the result of the