On Wed, Mar 21, 2012 at 05:04:56PM +0100, Pavel Sanda wrote: > Georg Baum wrote: > > commit yet)? I guess it would look like > > > > git checkout -b fixfileformat > > git commit > > git checkout master > > git merge fixfileformat > > git commit > > git branch -d fixfileformat > > The simplistic SVN-like scenario is just: > > git pull (update from public repo) > git commit (just local commit in your tree) > git push (push the commit to public repo)
Methinks git commit (just local commit in your tree) git pull --rebase (update from public repo and put local changes on top) git push (push the - possibly adjusted - commit to public repo) is closer to the SVN way. Andre'
