Re: [Development] Pushing rebases and unrelated changes together is a sin

2013-02-20 Thread Giuseppe D'Angelo
On 20 February 2013 08:47, Samuel Rødal samuel.ro...@digia.com wrote: and it makes the diff between patch sets displayed by the Gerrit interface (by choosing Old Version History to be other than Base) totally unreadable. The correct process when doing rebases is: .. is it me or there's

Re: [Development] Pushing rebases and unrelated changes together is a sin

2013-02-20 Thread Thiago Macieira
On quarta-feira, 20 de fevereiro de 2013 08.47.40, Samuel Rødal wrote: The correct process when doing rebases is: git pull --rebase # or your favorite git work-flow git push gerrit HEAD:refs/for/some_branch # add comment in change on gerrit about being a pure rebase # do some changes git

Re: [Development] Pushing rebases and unrelated changes together is a sin

2013-02-20 Thread Samuel Rødal
On 02/20/2013 09:22 AM, Thiago Macieira wrote: On quarta-feira, 20 de fevereiro de 2013 08.47.40, Samuel Rødal wrote: The correct process when doing rebases is: git pull --rebase # or your favorite git work-flow git push gerrit HEAD:refs/for/some_branch # add comment in change on gerrit

Re: [Development] Pushing rebases and unrelated changes together is a sin

2013-02-20 Thread Samuel Rødal
On 02/20/2013 01:01 PM, Shawn Rutledge wrote: On 20 February 2013 09:43, Samuel Rødal samuel.ro...@digia.com wrote: On 02/20/2013 09:22 AM, Thiago Macieira wrote: On quarta-feira, 20 de fevereiro de 2013 08.47.40, Samuel Rødal wrote: The correct process when doing rebases is: git pull

[Development] Pushing rebases and unrelated changes together is a sin

2013-02-19 Thread Samuel Rødal
Hello, it happens quite regularly that people do a rebase and in addition do changes in the same push. It looks like this: git pull --rebase # or cherry-pick or whatever you do # do some changes git commit -a --amend git push gerrit HEAD:refs/for/some_branch and it makes the diff between patch