From: Kristoffer Haugsbakk <kristofferhaugsbakk@xxxxxxxxxxxx>
From: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx>
This is easier to read.
Signed-off-by: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx>
---
Documentation/git-merge-tree.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index 590cbf5df79..10f8ac7f80a 100644
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -211,12 +211,12 @@ linkgit:git-commit-tree[1], linkgit:git-write-tree[1],
linkgit:git-update-ref[1], and linkgit:git-mktag[1]. Thus, it can be
used as a part of a series of steps such as:
- NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2)
+ newtree=$(git merge-tree --write-tree $branch1 $branch2)
test $? -eq 0 || die "There were conflicts..."
- NEWCOMMIT=$(git commit-tree $NEWTREE -mMerge -p $BRANCH1 -p $BRANCH2)
- git update-ref $BRANCH1 $NEWCOMMIT
+ newcommit=$(git commit-tree $newtree -mMerge -p $branch1 -p $branch2)
+ git update-ref $branch1 $newcommit
-Note that when the exit status is non-zero, `NEWTREE` in this sequence
+Note that when the exit status is non-zero, `newtree` in this sequence
will contain a lot more output than just a tree.
For conflicts, the output includes the same information that you'd get
--
2.46.1.641.g54e7913fcb6
