This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: A wrong commit

From: "Joseph S. Myers" <joseph at codesourcery dot com>
To: Roland McGrath <roland at hack dot frob dot com>
Cc: Kaz Kojima <kkojima at rr dot iij4u dot or dot jp>, libc-alpha at sourceware dot org
Date: Thu, 16 Feb 2012 00:21:08 +0000 (UTC)
Subject: Re: A wrong commit
References: <20120216.082030.531500168.kkojima@rr.iij4u.or.jp><20120215234624.A4F142C07B@topped-with-meat.com>

On Wed, 15 Feb 2012, Roland McGrath wrote:

> But AFAICT that commit is a no-op merge.
> So there's nothing that really needs to be done.

And if people want to avoid merge commits, I suggest using "git pull 
--rebase" instead of just "git pull" when merging in other people's 
changes to a tree with local commits.

-- 
Joseph S. Myers
joseph@codesourcery.com

Follow-Ups:
- Re: A wrong commit
  - From: Carlos O'Donell
- Re: A wrong commit
  - From: Thomas Schwinge

References:
- A wrong commit
  - From: Kaz Kojima
- Re: A wrong commit
  - From: Roland McGrath

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]