Skip to content

Commit c857c3a

Browse files
LemmingAvalanchegitster
authored andcommitted
doc: make the intent of sentence clearer
By adding the word "just", which might have been accidentally omitted. Adding the word "just" makes it clear that the point is to *not* do an octopus merge simply because you *can* do it. In other words, you should have a reason for doing it beyond simply having two (seemingly) independent commits that you need to merge into another branch, since it's not always the best approach. The previous sentence made it look more like it was trying to say that you shouldn't do an octopus merge *because* you can do an octopus merge. Although this interpretation doesn't make sense and the rest of the paragraph makes the intended meaning clear, this adjustment should make the intent of the sentence more immediately clear to the reader. Signed-off-by: Kristoffer Haugsbakk <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f383e4e commit c857c3a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/gitcore-tutorial.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ $ git show-branch
16351635
++* [master~2] Pretty-print messages.
16361636
------------
16371637

1638-
Note that you should not do Octopus because you can. An octopus
1638+
Note that you should not do Octopus just because you can. An octopus
16391639
is a valid thing to do and often makes it easier to view the
16401640
commit history if you are merging more than two independent
16411641
changes at the same time. However, if you have merge conflicts

0 commit comments

Comments
 (0)