Uwe Brauer <o...@mat.ucm.es> writes:
> > 2016-09-17 19:15 GMT+02:00 Uwe Brauer <o...@mat.ucm.es>:
> > The history of a repository is valuable, but flooding it with many
> > oneliner changes makes it somewhat less useful. I sometimes do this
> > with my personal and private projects, but if the code has to be seen
> > by other people these microchanges are often more a nuisance for other
> > readers as they add nothing to the history.
> Ok, but how to you do this with your local repos? I mean
> suppose you clone the auctex repo. And start a cool new feature in a
> branch. Commit several times etc. then
> - do you merge with master and send that patch (or push it)
> - do you rebase and collapse.
> - do it manually?
I guess Mosè does like me. Say in your experimental branch you develop
a new feature. Instead of merging that branch with master (which just
follows origin/master without changes), we do
$ git rebase master
and as a result, our 20 new, unpublished commits in our local
experimental branch are always the top of that branch's history.
Therefore we can easily squash them into one commit when the feature is
finally done. This single commit can then be merged into master and be
pushed (or sent as a patch to this mailing list).
Then, for anybody else except for you, it looks like this feature has
been implemented with one single commit.
auctex-devel mailing list