git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	Git Mailing List <git@vger.kernel.org>,
	Thomas Rast <trast@student.ethz.ch>,
	Jakub Narebski <jnareb@gmail.com>,
	Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: Re: [PATCH 0/2] log/ format-patch improvements
Date: Thu, 26 Aug 2010 23:22:38 +0530	[thread overview]
Message-ID: <20100826175234.GB25754@kytes> (raw)
In-Reply-To: <7vk4ndo05p.fsf@alter.siamese.dyndns.org>

Hi Junio,

Junio C Hamano writes:
> Jonathan Nieder <jrnieder@gmail.com> writes:
> 
> > Ramkumar Ramachandra wrote:
> > ...
> >> Good idea. I'll write a patch. Do we also want people to be able to
> >> turn off `--no-merges`?
> >
> > I don't see a need for it.
> >
> > However, if you can think of good names for --undo-no-merges and
> > --undo-merges options to "git log", that might be a nice independent
> > change for the revision option parser.
> 
> Wait a bit.  How would you represent a merge in a patch form that can be
> read by "git apply" (and "patch") in the first place?

Oh, I'm not attempting that. I merely wanted people to be able to turn
off `--no-merges` so they can get the current functionality.

As far as represeting merge commits go, I'm still thinking about it. I
talked to Thomas about it briefly on IRC. The main issues:
1. What's the point? When there's no conflict resolution, a merge
   commit would be empty.
2. How do we uniquely specify what to merge? We can't use branch names
   or commit SHA1s, because they can change.

-- Ram

  reply	other threads:[~2010-08-26 17:54 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-21 20:28 [PATCH 0/2] log/ format-patch improvements Ramkumar Ramachandra
2010-08-21 20:28 ` [PATCH 1/2] git-format-patch: Print a diagnostic message when ignoring commits Ramkumar Ramachandra
2010-08-21 20:28 ` [PATCH 2/2] log: Improve description of '-<n>' option in documentation Ramkumar Ramachandra
2010-08-25  8:44 ` [PATCH 0/2] log/ format-patch improvements Ramkumar Ramachandra
2010-08-25 20:54   ` Jonathan Nieder
2010-08-26  5:34     ` Ramkumar Ramachandra
2010-08-26  5:46       ` Jonathan Nieder
2010-08-26  7:06         ` Thomas Rast
2010-08-26 15:37         ` Junio C Hamano
2010-08-26 17:52           ` Ramkumar Ramachandra [this message]
2010-08-25 22:09   ` 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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=20100826175234.GB25754@kytes \
    --to=artagnon@gmail.com \
    --cc=Matthieu.Moy@imag.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jnareb@gmail.com \
    --cc=jrnieder@gmail.com \
    --cc=trast@student.ethz.ch \
    /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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).