I tried a rebase but couldn't get the older commit to combine with the newer commit. Perhaps because there are intervening commits or maybe because it's from github.
If I pull a remote commit today and commit it, why does the log show it as being committed on Aug 12? Yes I know that's when the PR was created but I can't imagine that ever being desirable & yet that's the default behavior. If I do a git flow finish & then rebase before pushing, will squashing it in with another commit from today cause that Aug 12 commit to jump forward to today's date? There are other intervening commits that were previously pushed to develop & I can't seem to move that old PR forward to be the latest commit. I'm referring to the command involved in "git pull github ..." -- something isn't right in that part of the wiki page & the docs for git pull weren't much better. I think we need some steps written up showing the proper best-practice for the rest of us to follow -- esp if we want to keep our git log clean. It's pretty weird to commit something today but have it inserted a week in the past in our git revisions. On Wednesday, August 19, 2015, Dan Smith <dsm...@pivotal.io> wrote: > You can always do a git rebase -i before you push if you want to fix up the > history. > > On Wed, Aug 19, 2015 at 4:18 PM, Kirk Lund <kl...@pivotal.io > <javascript:;>> wrote: > > > I just merged PR#15 in to develop. I tried following the instructions on > > https://cwiki.apache.org/confluence/display/GEODE/Code+contributions > but I > > couldn't get things to really work the way I wanted or the way the page > > seemed to describe it. > > > > I wanted all three of the following commits to be one commit on today's > > date with a single unified commit message including "GEODE-213". The > pulled > > commit went in for Aug 12 despite attempting to use --rebase instead of > > --squash. > > > > If anyone knows git well, please update that wiki page so that we can > > cleanly handle pull requests. > > > > commit bbc2a5fa5f0bbcd00a8ab64451a2528a22d88bc0 > > Merge: 9efe74e 581702a > > Author: Kirk Lund <kl...@pivotal.io <javascript:;>> > > Date: Wed Aug 19 16:09:21 2015 -0700 > > > > Merge branch 'feature/GEODE-213' into develop > > > > commit 581702ac1d2a9debe8619680d09fa868b9ca8b05 > > Author: Kirk Lund <kl...@pivotal.io <javascript:;>> > > Date: Wed Aug 19 16:01:26 2015 -0700 > > > > GEODE-213: New unit test that confirms bug > > > > commit 65e969439e3c03f5557b2e1adc609c97544ecb2b > > Author: Vito Gavrilov <vgavri...@pivotal.io <javascript:;>> > > Date: Wed Aug 12 13:13:55 2015 -0700 > > > > Fix JMX Http manager incorrectly treating 'start gateway-sender' > > endpoint as 'start gateway-receiver' > > > > <klund@klund-e6420>/c/dev/geode_CLEAN [590]$ git --version > > git version 2.4.5 > > > > <klund@klund-e6420>/c/dev/geode_CLEAN [594]$ git-flow version > > 1.8.0 (AVH Edition) > > >
