lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: My first push


From: Reinhold Kainhofer
Subject: Re: My first push
Date: Tue, 8 Apr 2008 15:41:19 +0200
User-agent: KMail/1.9.9

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am Dienstag, 8. April 2008 schrieb Trevor Daniels:
> 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?  

Well, not really. A git repository is practically a stack of patches, in the 
order in which they are applied... You can only easily push a whole branch, 
not single commits (since they depend on each other) and not single 
files/dirs. There is something called "cherry-picking" in git, but I haven't 
looked into that too much.

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

What I usually do is to work in separate local branches (switching between 
them is really easy, just a git checkout branchname). When I'm confident that 
something is ready for the master branch, I simply use "git-format-patch 
origin" in the working branch, switch to the master branch, pull there, apply 
only the patch that I want in the master branch (using qgit) and push the 
master branch.

Of course, every now and then I need to clean up my local working branches by 
doing a hard reset to master and then only re-applying those patches, which 
are still relevant.

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/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFH+3YKTqjEwhXvPN0RAlhcAJ96YoezI1FV09C6CBgcFSo7W2++SQCfQIvk
+pqAapazXDc34g15/PyLDdQ=
=zgll
-----END PGP SIGNATURE-----




reply via email to

[Prev in Thread] Current Thread [Next in Thread]