[haiku-commits] Re: haiku: hrev43956 - in src: data/keymaps preferences/keymap bin/keymap

  • From: Ingo Weinhold <ingo_weinhold@xxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 06 Apr 2012 13:36:09 +0200

On 2012-04-06 at 12:56:01 [+0200], John Scipione <jscipione@xxxxxxxxx> 
wrote:
> > It would have been nicer for reviewers to split these changes in
> > smaller ones while keeping them in one push. The way it's done now,
> > the commit is unreadable. Reminds me of our subversion days :)
> 
> Well, I had dozens of local commits, but, I branched twice and
> reverted a couple times, touched a whole bunch of other files and then
> undid the changes so if I had pushed that it would have been worse.
> Instead I rebased my changes into one big commit that contained only
> the relevant changes above, went through all the commits and
> summarized the pieces that made it through to the end. I suppose I
> could have included a couple of other commits in the push, but it
> would be hard to make sense of it all. In the end, it could have been
> worse, but yes, there are a lot of changes in one commit here.

With git it's rather easy to beautify the commit history afterwards. E.g. 
in this case you could just pop the big final commit (git reset HEAD^) and 
recommit it piecemeal.

CU, Ingo

Other related posts: