From: Thomas Ackermann Date: Sat, 24 Aug 2013 07:32:25 GMT Subject: [PATCH 09/13] Improve section "Merge multiple trees" Message-ID: <1473018875.1091101.1377329545934.JavaMail.ngmail@webmail08.arcor-online.net> In-Reply-To: <282216171.1090748.1377328932833.JavaMail.ngmail@webmail08.arcor-online.net> Remove unnecessary quoting. Simplify description of three-way merge. Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index d5baf03..f713f26 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -3992,16 +3992,16 @@ Merging multiple trees Git helps you do a three-way merge, which you can expand to n-way by repeating the merge procedure arbitrary times until you finally -"commit" the state. The normal situation is that you'd only do one +commit the state. The normal situation is that you'd only do one three-way merge (two parents), and commit it, but if you like to, you can do multiple parents in one go. -To do a three-way merge, you need the two sets of "commit" objects +To do a three-way merge, you need the two commit objects that you want to merge, use those to find the closest common parent (a -third "commit" object), and then use those commit objects to find the -state of the directory ("tree" object) at these points. +third commit object: the merge base), and then use those commit objects to find the +state of the directory (i.e. tree object) at these points. -To get the "base" for the merge, you first look up the common parent +To get the base for the merge, you first look up the common parent of two commits with ------------------------------------------------- @@ -4009,8 +4009,8 @@ $ git merge-base ------------------------------------------------- which will return you the commit they are both based on. You should -now look up the "tree" objects of those commits, which you can easily -do with (for example) +now look up the tree objects of those commits, which you can easily +do with ------------------------------------------------- $ git cat-file commit | head -1 -- 1.8.3.msysgit.0 --- Thomas