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: GNU C Library master sources branch, master, updated.glibc-2.12-220-geaca756


  Hi!

  Thanks for checking this in!

On Mon, Nov 22, 2010 at 04:16:17PM -0000, drepper@sourceware.org wrote:
>     Conflicts:
>     
>     	ChangeLog

  To avoid ChangeLog conflicts when cherry-picking and merging, you
might find it useful to take a look at the git-merge-changelog merge
driver, as described in

	http://sourceware.org/glibc/wiki/GlibcGit#ChangeLog

				Petr "Pasky" Baudis


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