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 <kristoffer.haugsbakk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Kristoffer Haugsbakk committed Dec 9, 2016 at 16:51 UTC c857c3a1ceeeb31cfb90606e1d412f838f4a653d
1 file changed +1 -1
Documentation/gitcore-tutorial.txt
+1 -1
@@ -1635,7 +1635,7 @@ $ git show-branch
1635 ++* [master~2] Pretty-print messages.
1636 ------------
1637
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
1639 is a valid thing to do and often makes it easier to view the
1640 commit history if you are merging more than two independent
1641 changes at the same time. However, if you have merge conflicts