Re: My first push

[Trevor Daniels]

Thanks Reinhold

I've not been able to work out how to push the changes to just a single file 
or directory - I presume that's possible?  I was wary of pushing the whole 
repository in case I had a few forgotten local commits, but that was all I 
could make work.  Fortunately there was only one and that was quite recent. 
I think this was a change Graham and I made simultaneously.

Do you have a recommended way of working?  I'll only be changing the 
documentation files.

Trevor

----- Original Message ----- 
From: "Reinhold Kainhofer" <address@hidden>
To: "Trevor Daniels" <address@hidden>; "Lily-Devel List" 
<address@hidden>
Sent: Tuesday, April 08, 2008 12:15 PM
Subject: Re: My first push


> Am Dienstag, 8. April 2008 schrieb Trevor Daniels:
> > Hi
> >
> > I've just made my first trial push into master.  The intended change is
> > trivial - adds a comma to the text in documentation/user/tweaks.itely.
> > Could someone please check this has done what it should and that I've not
> > screwed up anything.
>
> You commited that commit to tweaks.itely, but also some other commits, 
> like
>
> 2008-03-29 18:48:16: Fix duplicated paragraph 
> (fb0ab0825eb130adb2fea6c66...)
>
> and lots of merges due to that older local commit of yours. Since you had 
> a
> local commit, which was not in master, each pull created a new commit in 
> your
> local repository, which you now also pushed to the server. There is no
> difference in the actual contents of the files, but the git history is 
> simply
> cluttered with some unnecessary merge commits...
>
> Cheers,
> Reinhold
> --
> ------------------------------------------------------------------
> Reinhold Kainhofer, Vienna University of Technology, Austria
> email: address@hidden, http://reinhold.kainhofer.com/
> * Financial and Actuarial Mathematics, TU Wien, 
> http://www.fam.tuwien.ac.at/
> * K Desktop Environment, http://www.kde.org, KOrganizer maintainer
> * Chorvereinigung "Jung-Wien", http://www.jung-wien.at/