Thread (7 messages) 7 messages, 3 authors, 2016-06-15

Re: [PATCH 4/5] atmel_serial: Split the interrupt handler

From: Haavard Skinnemoen <hidden>
Date: 2016-06-15 22:44:00

On Wed, 19 Dec 2007 15:37:45 -0500
Sean [off-list ref] 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help