Re: Trying to understand git

2009-04-20 Thread Jason D. Clinton
AFAICT, Edward Hervey merged your translation with the ones he had been queing up by doing a git pull with out --rebase. Why this wasn't caught by the pre-commit checks, I do not know. I don't think you did anything wrong. 2009/4/20 Milo Casagrande : > Hi, > > I'm here again with silly questions

Re: Issue with Merge Commits and using 'git pull --rebase' (Was: Re: Trying to understand git)

2009-04-20 Thread Behdad Esfahbod
On 04/20/2009 05:45 PM, Simos Xenitellis wrote: 2009/4/20 Milo Casagrande: Hi, I'm here again with silly questions trying to understand the correct use of git... Today I did a commit for pitivi [1], I was in master (and my copy is still in master) and I did the commit there, when I checked at

Issue with Merge Commits and using 'git pull --rebase' (Was: Re: Trying to understand git)

2009-04-20 Thread Simos Xenitellis
2009/4/20 Milo Casagrande : > Hi, > > I'm here again with silly questions trying to understand the correct use > of git... > > Today I did a commit for pitivi [1], I was in master (and my copy is > still in master) and I did the commit there, when I checked at cgit the > green box with master writt

Trying to understand git

2009-04-20 Thread Milo Casagrande
Hi, I'm here again with silly questions trying to understand the correct use of git... Today I did a commit for pitivi [1], I was in master (and my copy is still in master) and I did the commit there, when I checked at cgit the green box with master written on it was on my commit description. To