Re: merge time
From: <hidden>
Date: 2016-06-15 22:43:25
On Mon, 30 Jul 2007, Matthew L Foster wrote:
quoted hunk ↗ jump to hunk
--- david@lang.hm wrote:quoted
if you clone your tree and merge from mine, and I clone my tree and merge from yours, the result of both merges _must_ be the same there will be trouble when we both try and merge with tree C later on. another thing is that a given commit cannot be changed once it's created (if it was changed it wouldn't have the same sha1 value) so you can't just go around changeing dates on commits that took place elsewhere.Local commit order is stored locally right?
not normally. you could enable reflogs and then mine through the reflogs to find the info, but it's not stored in any easy to access fashion. David Lang
From looking at gitweb on kernel.org it seems all the info is already there, a merge has a list of commits in that merge and they should be displayed in local commit order rather than external creation time order. -Matt ____________________________________________________________________________________Ready for the edge of your seat? Check out tonight's top picks on Yahoo! TV. http://tv.yahoo.com/