git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kristoffer Haugsbakk <kristoffer.haugsbakk@gmail.com>
To: git@vger.kernel.org
Cc: Kristoffer Haugsbakk <kristoffer.haugsbakk@gmail.com>
Subject: [PATCH 3/4] doc: make the intent of sentence clearer
Date: Fri,  9 Dec 2016 16:51:11 +0100	[thread overview]
Message-ID: <20161209155112.2112-4-kristoffer.haugsbakk@gmail.com> (raw)
In-Reply-To: <20161209155112.2112-1-kristoffer.haugsbakk@gmail.com>

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>
---
 Documentation/gitcore-tutorial.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 72ed90ca3..72ca9c1ef 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -1635,7 +1635,7 @@ $ git show-branch
 ++* [master~2] Pretty-print messages.
 ------------
 
-Note that you should not do Octopus because you can.  An octopus
+Note that you should not do Octopus just because you can.  An octopus
 is a valid thing to do and often makes it easier to view the
 commit history if you are merging more than two independent
 changes at the same time.  However, if you have merge conflicts
-- 
2.11.0


  parent reply	other threads:[~2016-12-09 15:53 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-09 15:51 [PATCH 0/4] doc: fixes to gitcore-tutorial.txt Kristoffer Haugsbakk
2016-12-09 15:51 ` [PATCH 1/4] doc: add articles (grammar) Kristoffer Haugsbakk
2016-12-10 20:28   ` Philip Oakley
2016-12-13 13:05     ` Kristoffer Haugsbakk
2016-12-13 18:11       ` Junio C Hamano
2016-12-13 21:34         ` Kristoffer Haugsbakk
2016-12-09 15:51 ` [PATCH 2/4] doc: add verb in front of command to run Kristoffer Haugsbakk
2016-12-10 20:48   ` Philip Oakley
2016-12-09 15:51 ` Kristoffer Haugsbakk [this message]
2016-12-10 20:52   ` [PATCH 3/4] doc: make the intent of sentence clearer Philip Oakley
2016-12-13 13:23     ` Kristoffer Haugsbakk
2016-12-09 15:51 ` [PATCH 4/4] doc: omit needless "for" Kristoffer Haugsbakk
2016-12-11 13:04   ` Philip Oakley
2016-12-11 14:08     ` Philip Oakley
2016-12-09 23:13 ` [PATCH 0/4] doc: fixes to gitcore-tutorial.txt Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161209155112.2112-4-kristoffer.haugsbakk@gmail.com \
    --to=kristoffer.haugsbakk@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).