From: Andrew Morton <akpm@linux-foundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: git@vger.kernel.org
Subject: Re: my git problem
Date: Mon, 28 Apr 2008 19:14:13 -0700 [thread overview]
Message-ID: <20080428191413.6aa79054.akpm@linux-foundation.org> (raw)
In-Reply-To: <alpine.LFD.1.10.0804281512110.3119@woody.linux-foundation.org>
On Mon, 28 Apr 2008 15:14:20 -0700 (PDT) Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
>
> On Mon, 28 Apr 2008, Linus Torvalds wrote:
> >
> > I don't actually see what was wrong with the old script. The merge was
> > really oddly done, but apart from that, something like this should work
> > (just your old script with some trivial fixes to 'git merge' and using
> > somewhat saner arguments):
>
> Side note: you are still going to have *exactly* the same issue if you
> have other git trees (not origin) that contain the same patch.
>
yup. The same-patch-in-two-trees problem is surprisingly rare.
prev parent reply other threads:[~2008-04-29 2:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-27 18:29 my git problem Andrew Morton
2008-04-27 19:15 ` Linus Torvalds
2008-04-27 19:44 ` Andrew Morton
2008-04-27 20:24 ` Linus Torvalds
2008-04-28 18:45 ` Andrew Morton
2008-04-28 18:49 ` Johannes Schindelin
2008-04-28 19:09 ` Andrew Morton
2008-04-28 19:13 ` Johannes Schindelin
2008-04-28 19:28 ` Linus Torvalds
2008-04-29 17:15 ` J. Bruce Fields
2008-04-30 8:17 ` Jakub Narebski
2008-04-28 19:33 ` Andrew Morton
2008-04-28 19:21 ` Linus Torvalds
2008-04-28 19:54 ` Andrew Morton
2008-05-01 6:01 ` Carl Worth
2008-04-28 19:52 ` Daniel Barkalow
2008-04-28 21:35 ` Andrew Morton
2008-04-28 21:47 ` Linus Torvalds
2008-04-28 22:04 ` Johannes Schindelin
2008-04-28 22:14 ` Linus Torvalds
2008-04-29 2:14 ` Andrew Morton [this message]
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=20080428191413.6aa79054.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.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.