From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Shawn Ligocki <sligocki@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Merge made by recursive?
Date: Wed, 25 May 2011 23:12:28 +0530 [thread overview]
Message-ID: <BANLkTikRW+k38sHcokL=FsNmLRNF0+E--w@mail.gmail.com> (raw)
In-Reply-To: <loom.20110525T192418-887@post.gmane.org>
Hi Shawn,
Shawn Ligocki writes:
> Is this intentionally bad grammar? Every time I see it, I cringe a little. What
> does it even mean? That it merged incrementally through each subsequent revision?
I suppose it's yet another quirk I've got used to -- "recursive"
refers to the merge strategy that was used; see git-merge(1). We can
definitely make the Porcelain say something nicer like `merged
successfully using "recursive" merge strategy`.
Patches are welcome: see Documentation/SubmittingPatches :)
-- Ram
next prev parent reply other threads:[~2011-05-25 17:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-25 17:28 Merge made by recursive? Shawn Ligocki
2011-05-25 17:42 ` Ramkumar Ramachandra [this message]
2011-05-25 18:04 ` Jakub Narebski
2011-05-25 19:30 ` Junio C Hamano
2011-05-25 19:50 ` Jeff King
2011-05-25 20:17 ` Junio C Hamano
2011-05-25 20:47 ` Junio C Hamano
2011-05-25 21:02 ` Jeff King
2011-05-25 21:25 ` Jeff King
2011-05-25 22:46 ` Jeff King
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='BANLkTikRW+k38sHcokL=FsNmLRNF0+E--w@mail.gmail.com' \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=sligocki@gmail.com \
/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).