Subject : git best practices

Hi there, I think private history should be squashed before getting applied to master. I don't see any harms to have the whole history in a dedicated branch but it can be confusing if kept in master. We need some rules to avoid this or Cyrus git log will become harder and harder to use. What do

Re: Subject : git best practices

On Fri, 19 Aug 2011, Olivier ROLAND wrote: > I think private history should be squashed before getting applied to master. > I don't see any harms to have the whole history in a dedicated branch > but it can be confusing if kept in master. > > We need some rules to avoid this or Cyrus git log will

Re: Subject : git best practices

2011/8/19 Henrique de Moraes Holschuh : > > IMHO, if you're going to come up with rules for that, better do as it is > done in the Linux kernel or in git itself. > > The rules are: > * detailed changelogs on every commit > * only cleaned up commits are sent up for merging in the mainline.

Re: Subject : git best practices

Olivier ROLAND wrote: > 2011/8/19 Henrique de Moraes Holschuh : > > IMHO, if you're going to come up with rules for that, better do as it is > > done in the Linux kernel or in git itself. > > > > The rules are: > > * detailed changelogs on every commit > > * only cleaned up commits are sen

Re: Subject : git best practices

> If genuinely a topic-branch, try the following: > > $ git checkout --track -b dev-something origin/master > > $ git config branch.dev-something.autosetuprebase always > > ^ I have this in my ~/.gitconfig to apply globally, BTW > > $ > > $ git commit > > $ > > $ > > $ git commit > > (possibly g