All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jon Seymour <jon.seymour@gmail.com>
To: Git Mailing List <git@vger.kernel.org>, spearce@spearce.org
Subject: Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with  the HEAD in the case of conflicts.
Date: Tue, 30 Mar 2010 10:08:33 +1100	[thread overview]
Message-ID: <2cfc40321003291608r2b6c7aaap797b4452985438e9@mail.gmail.com> (raw)
In-Reply-To: <2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com>

Apologies, it broke again.

The command I ran to submit the patch was:

   git format-patch -M git-gui-patch~2.. --stdout | git imap-send

I did with git 1.6.6.1, running on cygwin however this process appears
to be corrupting the patch.

Can anyone let me know what I have done wrong?

jon.

On Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour <jon.seymour@gmail.com> wrote:
> Resending because my original patch series wasn't whitespace clean and
> I have now removed the configuration to make the safe behaviour
> optional - it is not safe by default.
>
> If there is any other reason why this patch should not be considered,
> please let me know.
>
> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to
> encapsulate its derivation.
> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in
> the case of conflicts.
>
> jon.
>

  parent reply	other threads:[~2010-03-29 23:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-29 23:00 [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts Jon Seymour
2010-03-29 23:02 ` Jon Seymour
2010-03-29 23:08 ` Jon Seymour [this message]
2010-03-30  6:44 ` Johannes Sixt
     [not found]   ` <2cfc40321003292359u2b4d3fcfved860ab28338709a@mail.gmail.com>
2010-03-30  7:00     ` Jon Seymour

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=2cfc40321003291608r2b6c7aaap797b4452985438e9@mail.gmail.com \
    --to=jon.seymour@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.