summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.7.7.7.txt
diff options
context:
space:
mode:
authorLibravatar Kristoffer Haugsbakk <kristoffer.haugsbakk@gmail.com>2016-12-09 16:51:11 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-09 15:14:01 -0800
commitc857c3a1ceeeb31cfb90606e1d412f838f4a653d (patch)
treea09b77183a9b85a228601b13bb8dd32300c153a8 /Documentation/RelNotes/1.7.7.7.txt
parentdoc: add verb in front of command to run (diff)
downloadtgif-c857c3a1ceeeb31cfb90606e1d412f838f4a653d.tar.xz
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>
Diffstat (limited to 'Documentation/RelNotes/1.7.7.7.txt')
0 files changed, 0 insertions, 0 deletions