From: Haavard Skinnemoen <hskinnemoen@atmel.com>
To: Sean <seanlkml@sympatico.ca>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 4/5] atmel_serial: Split the interrupt handler
Date: Wed, 19 Dec 2007 22:02:23 +0100 [thread overview]
Message-ID: <20071219220223.7c5b3887@siona> (raw)
In-Reply-To: <BAYC1-PASMTP13613FE244FF93DC2BF613AE5C0@CEZ.ICE>
On Wed, 19 Dec 2007 15:37:45 -0500
Sean <seanlkml@sympatico.ca> wrote:
> Can't reproduce this here with the version of Git you're using
> (1.5.3.4). Can you figure out a small test case that shows the
> problem? Perhaps the problem only shows up in your environment or
> with your particular config file settings.
Ah...seems like it only happens when I use git-rebase --interactive...
Test case:
1. Start with two branches pointing to the same commit
2. Modify the same file on both branches in conflicting ways.
3. Commit using a different author than the default.
4. Use git rebase -i to rebase one of the branches on top of the other
5. Resolve the conflict, update the index and run git rebase --continue
The last commit is now attributed to the correct name, but the default
e-mail address (from git-config.)
Just tested it with git 1.5.3.6 on a different computer.
> P.S. Trimmed CC list.
Thanks :-)
Haavard
next prev parent reply other threads:[~2007-12-19 21:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-18 17:06 [PATCH 0/5] atmel_serial: Cleanups, irq handler splitup & DMA Haavard Skinnemoen
2007-12-18 17:06 ` [PATCH 1/5] atmel_serial: Clean up the code Haavard Skinnemoen
2007-12-18 17:06 ` [PATCH 2/5] atmel_serial: Use cpu_relax() when busy-waiting Haavard Skinnemoen
2007-12-18 17:06 ` [PATCH 3/5] atmel_serial: Use existing console options only if BRG is running Haavard Skinnemoen
2007-12-18 17:06 ` [PATCH 4/5] atmel_serial: Split the interrupt handler Haavard Skinnemoen
2007-12-18 17:06 ` [PATCH 5/5] atmel_serial: Add DMA support Haavard Skinnemoen
2007-12-18 18:18 ` Chip Coldwell
2007-12-18 17:10 ` [PATCH 4/5] atmel_serial: Split the interrupt handler Haavard Skinnemoen
2007-12-18 18:19 ` Chip Coldwell
2007-12-19 11:40 ` Haavard Skinnemoen
2007-12-19 14:07 ` Haavard Skinnemoen
2007-12-19 20:37 ` Sean
2007-12-19 21:02 ` Haavard Skinnemoen [this message]
2007-12-19 21:34 ` [PATCH] Fix interactive rebase to preserve author email address Sean
2007-12-19 22:11 ` Johannes Schindelin
2007-12-19 22:11 ` Haavard Skinnemoen
2007-12-18 23:15 ` [PATCH 4/5] atmel_serial: Split the interrupt handler Jiri Slaby
2007-12-19 9:50 ` Haavard Skinnemoen
2007-12-19 7:29 ` [PATCH 0/5] atmel_serial: Cleanups, irq handler splitup & DMA Vadim Yatsenko
2007-12-19 9:54 ` Haavard Skinnemoen
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=20071219220223.7c5b3887@siona \
--to=hskinnemoen@atmel.com \
--cc=git@vger.kernel.org \
--cc=seanlkml@sympatico.ca \
/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.