Re: Git push commands

2008-07-04 Thread Carl Sorensen
Reinhold Kainhofer kainhofer.com> writes: > > > Am Freitag, 4. Juli 2008 schrieb Carl D. Sorensen: > > What should I do different to avoid the merge commit every time I push? > > I do "git pull" very often, typically before I do a git commit locally. This > way, your changes are then realativ

Re: Git push commands

2008-07-04 Thread Johannes Schindelin
Hi, On Thu, 3 Jul 2008, Carl D. Sorensen wrote: > I'm now able to push changes to the repository, but every time I do a > push, I get two commits -- one for the changes I made, and one for a > merge. Funny. For another project I am working on, I wrote an introduction for exactly this, a coup

Re: Git push commands

2008-07-04 Thread Reinhold Kainhofer
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am Freitag, 4. Juli 2008 schrieb Carl D. Sorensen: > What should I do different to avoid the merge commit every time I push? I do "git pull" very often, typically before I do a git commit locally. This way, your changes are then realative to HEAD (=t

Re: Git push commands

2008-07-03 Thread Graham Percival
If you look at gitweb, you'll see a ton of merge commits. I was told not to worry about them. Cheers, - Graham On Thu, 3 Jul 2008 21:47:10 -0600 "Carl D. Sorensen" <[EMAIL PROTECTED]> wrote: > I'm now able to push changes to the repository, but every time I do a > push, I get two commits -- on

Git push commands

2008-07-03 Thread Carl D. Sorensen
I'm now able to push changes to the repository, but every time I do a push, I get two commits -- one for the changes I made, and one for a merge. Obviously I'm doing something wrong. I'd appreciate some guidance about how to do it right. Here's my setup: sorensen2:lilypond-working Carl$ git rem