Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757365AbXLSOHr (ORCPT ); Wed, 19 Dec 2007 09:07:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753946AbXLSOHj (ORCPT ); Wed, 19 Dec 2007 09:07:39 -0500 Received: from nat-132.atmel.no ([80.232.32.132]:61318 "EHLO relay.atmel.no" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753884AbXLSOHj (ORCPT ); Wed, 19 Dec 2007 09:07:39 -0500 Date: Wed, 19 Dec 2007 15:07:34 +0100 From: Haavard Skinnemoen To: git@vger.kernel.org Cc: Chip Coldwell , linux@arm.linux.org.uk, kernel@avr32linux.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.arm.linux.org.uk, Bohmer , Andrew Victor Subject: Re: [PATCH 4/5] atmel_serial: Split the interrupt handler Message-ID: <20071219150734.50b1f847@dhcp-252-066.norway.atmel.com> In-Reply-To: <20071219124008.4945e592@dhcp-252-066.norway.atmel.com> References: <1197997575-13292-1-git-send-email-hskinnemoen@atmel.com> <1197997575-13292-2-git-send-email-hskinnemoen@atmel.com> <1197997575-13292-3-git-send-email-hskinnemoen@atmel.com> <1197997575-13292-4-git-send-email-hskinnemoen@atmel.com> <1197997575-13292-5-git-send-email-hskinnemoen@atmel.com> <20071218181019.2af46418@dhcp-252-066.norway.atmel.com> <20071219124008.4945e592@dhcp-252-066.norway.atmel.com> Organization: Atmel Norway X-Mailer: Claws Mail 3.1.0 (GTK+ 2.12.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 930 Lines: 23 On Wed, 19 Dec 2007 12:40:08 +0100 Haavard Skinnemoen wrote: > Btw, the funny thing is that, looking at my shell history, I think I > actually did the right thing when committing your patches: > > git commit -s --author 'Remy Bohmer ' > git commit -s --author 'Chip Coldwell ' > > But for some reason only your names stuck, not your e-mail addresses... It just happened again. Seems like if git-rebase hits a conflict, and I just do "git-rebase --continue" after resolving it (and updating the index), the original author's name is used, but not his e-mail address. Looks like a bug in git-rebase...? Haavard -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/