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

Documentation: fix and clarify grammar in git-merge docs.

Browse Source 
Signed-off-by: Dave Peticolas <dave@krondo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dave Peticolas 2008-01-15 21:16:05 -08:00 committed by Junio C Hamano
parent 6232f62bc7
commit b98525e4bf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/git-merge.txt
View File

@ -74,14 +74,14 @@ it happens. In other words, `git-diff --cached HEAD` must
report no changes. report no changes.
[NOTE] [NOTE]
This is a bit of lie. In certain special cases, your index are This is a bit of a lie. In certain special cases, your index is
allowed to be different from the tree of `HEAD` commit. The most allowed to be different from the tree of the `HEAD` commit. The most
notable case is when your `HEAD` commit is already ahead of what notable case is when your `HEAD` commit is already ahead of what
is being merged, in which case your index can have arbitrary is being merged, in which case your index can have arbitrary
difference from your `HEAD` commit. Otherwise, your index entries differences from your `HEAD` commit. Also, your index entries
are allowed have differences from your `HEAD` commit that match may have differences from your `HEAD` commit that match
the result of trivial merge (e.g. you received the same patch the result of a trivial merge (e.g. you received the same patch
from external source to produce the same result as what you are from an external source to produce the same result as what you are
merging). For example, if a path did not exist in the common merging). For example, if a path did not exist in the common
ancestor and your head commit but exists in the tree you are ancestor and your head commit but exists in the tree you are
merging into your repository, and if you already happen to have merging into your repository, and if you already happen to have