From: Thomas Rast <trast@student.ethz.ch>
To: Michael Witten <mfwitten@gmail.com>
Cc: anikey <arty.anikey@gmail.com>, <git@vger.kernel.org>
Subject: Re: Git Bug - diff in commit message.
Date: Fri, 9 Sep 2011 02:56:36 +0200 [thread overview]
Message-ID: <201109090256.36306.trast@student.ethz.ch> (raw)
In-Reply-To: <CAMOZ1BtbpbG+19G6Hfau_2_F5L3Ad+x-Payd9aKajJxU_V_tyA@mail.gmail.com>
Michael Witten wrote:
> On Thu, Sep 8, 2011 at 14:49, anikey <arty.anikey@gmail.com> wrote:
> > Hi, peops. I'm pretty much sure that's a bug.
> >
> > What I did was putting git diff (i needed to tell people that for my changes
> > to start working they needed to aplly message-inline patch to some code
> > which was not under git) in commit message. Like adding:
>
> It would appear that `git rebase' is in fact producing patches with
> `git format-patch' and then applying the resulting patches with `git
> am', which gets confused by your inline diff; this can be clearly seen
> in the `git-rebase--am[.sh]' file.
>
> Perhaps `git rebase' should be reimplemented to use `git cherry-pick',
> or does that suffer from the same problem?
It doesn't, since it uses a three-way merge. But there's no real
reason to reimplement anything; just use an interactive rebase, it
uses cherry-pick in a loop.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2011-09-09 0:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-08 14:49 Git Bug - diff in commit message anikey
2011-09-08 16:26 ` Michael Witten
2011-09-09 0:56 ` Thomas Rast [this message]
2011-09-09 6:14 ` Johannes Sixt
2011-09-09 16:00 ` Junio C Hamano
2011-10-11 23:00 ` Junio C Hamano
2011-10-24 23:24 ` Martin von Zweigbergk
2011-10-25 14:11 ` Junio C Hamano
2011-09-08 17:27 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201109090256.36306.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=arty.anikey@gmail.com \
--cc=git@vger.kernel.org \
--cc=mfwitten@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).