From: Tim Waugh <twaugh@redhat.com>
To: Jack Andrews <effbiae@gmail.com>
Cc: patchutils-list@sourceware.org
Subject: Re: reorder patches
Date: Thu, 19 Jun 2008 13:31:00 -0000 [thread overview]
Message-ID: <1213882233.4212.7.camel@cyberelk.elk> (raw)
In-Reply-To: <2cf50a010806190627r3e9589dft2b96b9fdd91f57c9@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
On Thu, 2008-06-19 at 23:27 +1000, Jack Andrews wrote:
> is it solved in the case i have the base source as well as the patches?
Certainly 'git rebase -i' seems to manage it quite well for git
repositories. It is more sophisticated in that it allows several
different types of 'merge driver' to help with merge conflicts.
Tim.
*/
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2008-06-19 13:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-19 13:13 Jack Andrews
2008-06-19 13:19 ` Tim Waugh
2008-06-19 13:28 ` Jack Andrews
2008-06-19 13:31 ` Tim Waugh [this message]
2008-06-19 13:29 ` Serj Kalichev
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=1213882233.4212.7.camel@cyberelk.elk \
--to=twaugh@redhat.com \
--cc=effbiae@gmail.com \
--cc=patchutils-list@sourceware.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 read-only IMAP folder(s) and NNTP newsgroup(s).