Clean AND Full Revision History

6 thoughts
last posted July 8, 2013, 1:51 p.m.
0
get stream as: markdown or atom
0

There tend to be two schools of thought when it comes to revision history in something like Git:

  • the history should fully reflect exactly what was done
  • the history should cleanly reflect what was intended

The latter group will tend to make use of interactive rebase, etc to make the history as clear and logical as possible. But it's revisionist history.

0

Perhaps it's the scientist in me, but I don't want to throw away data. I want to be able to go back and see exactly what was done, even if it was a false start or a bug or a silly typo.

But I also value a clear outline of what was done at a pristine, high level.

0

I wonder if there's a way to use Git that would give you the best of both worlds: be able to rewrite history with an interactive rebase but also keep the original around.

0

It seems to me that could be as simple as ensuring an extra branch is made before a rebase so the old history doesn't get garbage collected.

0

@jtauber curious, why would you care about my stupid typo in my fork?

— rchavik (@rchavik) July 8, 2013
0

@rchavik I may not, in which case I presumably just merge in the clean version of your branch.

— James Tauber (@jtauber) July 8, 2013