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

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