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: How should files be moved in the glibc repository


On Tue, 29 Nov 2016, Steve Ellcey wrote:

> email before I send it.  I didn't send my patch this way ultimitely
> because I had committed my changes on the master branch (locally), then
> before sending anything I wanted to update it with any changes from the
> FSF tree so I did a 'git pull'.  That worked and it seemed to merge my

If you commit to local master, you should also use "git pull --rebase" 
rather than plain pull.  (We generally avoid merge commits on glibc 
master, keeping the history linear.)

-- 
Joseph S. Myers
joseph@codesourcery.com

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