All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adam Majer <adamm@zombino.com>
To: git@vger.kernel.org
Subject: git and appending merge commits
Date: Sun, 25 May 2008 22:35:42 -0500	[thread overview]
Message-ID: <483A300E.6090104@zombino.com> (raw)

Hi all,

I've recently started using Git and it is a very nice tool. During some
merging, I've come upon one type of issue that seems to be a bug
somewhere. To reproduce,


  1. branch master
  2. branch upstream
  3. add new version to upstream
  4. merge it to master
  5. append master merge changeset

#5 results in "messsed up" diffs

For an example of such a mess up please see,

http://git.debian.org/?p=collab-maint/mrtg.git;a=commitdiff;h=a8bc78ffd6d51ab09a791fa97e25f57b60eecd06

It appears that the tool generates a patch to a patch and displays that
instead of the appended merge diff which is what I would have expected..

Is current output by design?

- Adam

PS. I should have probably used a new commit to do that changelog
addition instead of appending the merge!

             reply	other threads:[~2008-05-26  4:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-26  3:35 Adam Majer [this message]
2008-05-26  4:51 ` git and appending merge commits Shawn O. Pearce
2008-05-26  4:59 ` Junio C Hamano
2008-05-26  6:39   ` Adam Majer

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=483A300E.6090104@zombino.com \
    --to=adamm@zombino.com \
    --cc=git@vger.kernel.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.