[10:11:42 CST(-0600)] <EricDalquist> morning drewwills
[10:11:55 CST(-0600)] <EricDalquist> I'll take a look at the rel-4-0 tree in just a minute
[10:35:32 CST(-0600)] <drewwills> morning – thanks
[10:35:37 CST(-0600)] <EricDalquist> so
[10:35:41 CST(-0600)] <EricDalquist> it isn't terrible
[10:35:45 CST(-0600)] <EricDalquist> only about 8 dupelicate commits
[10:35:52 CST(-0600)] <EricDalquist> not worth doing a force push to cleanup
[10:35:59 CST(-0600)] <EricDalquist> since that would break anyone that has pulled since your push
[10:36:00 CST(-0600)] <drewwills> that's what I imagined
[10:36:11 CST(-0600)] <EricDalquist> does gitk work on windows?
[10:36:23 CST(-0600)] <drewwills> yep
[10:37:01 CST(-0600)] <EricDalquist> that is what I usually have open when I'm doing merges
[10:37:07 CST(-0600)] <EricDalquist> just do an F5 in it after the merge
[10:37:13 CST(-0600)] <EricDalquist> and you get a nice picture of the history
[10:38:06 CST(-0600)] <drewwills> roger
[10:38:27 CST(-0600)] <drewwills> i did the work in master, then a $git cherry-pick in rel-4-0-patches
[10:38:58 CST(-0600)] <EricDalquist> what did you cherry-pick?