...
[16:20:38 CDT(-0500)] <EricDalquist> ok stats reporting is in 4.0-patches now
[16:41:56 CDT(-0500)] <chris_cousquer> @EricDalquist I think git cherry have a strange behavior on date in Github...
[16:42:12 CDT(-0500)] <EricDalquist> not cherry-pick
[16:42:21 CDT(-0500)] <EricDalquist> that does do "fun" stuff with dates
[16:42:29 CDT(-0500)] <EricDalquist> since the date of the cherry-picked commit doesn't change
[16:42:38 CDT(-0500)] <EricDalquist> git cherry shows things that might need to be merged
[16:42:54 CDT(-0500)] <EricDalquist> like when on the master branch
[16:42:57 CDT(-0500)] <EricDalquist> I run:
[16:42:58 CDT(-0500)] <EricDalquist> git cherry -v rel-4-0-patches HEAD uportal-4.0.6.SR1
[16:43:20 CDT(-0500)] <EricDalquist> that shows me all the commits on master since 4.0.6 with markers for what needs to be merged and what has been merged
[16:43:34 CDT(-0500)] <chris_cousquer> yes but look at https://github.com/Jasig/uPortal/commits/master
[16:43:59 CDT(-0500)] <EricDalquist> right
[16:44:05 CDT(-0500)] <EricDalquist> commit date != commit order in git
[16:44:08 CDT(-0500)] <EricDalquist> this isn't svn
[16:44:20 CDT(-0500)] <chris_cousquer> yes
[16:44:31 CDT(-0500)] <EricDalquist> I made those changes in UW's branch of uPortal
[16:44:38 CDT(-0500)] <EricDalquist> and realized I needed to merge them over
[16:45:25 CDT(-0500)] <chris_cousquer> was looking at your latest change and authored a month ago...
[16:45:34 CDT(-0500)] <chris_cousquer>
[16:45:59 CDT(-0500)] <chris_cousquer> sorry
[16:46:27 CDT(-0500)] <chris_cousquer> but I'm french
[16:46:42 CDT(-0500)] <EricDalquist> lol