[Kde-pim] Re: Pushing a single commit in git

[twelve.eighty at gmail.com]

We should probably standardize the procedure in the documentation. For me, I don't have commit rights and even I got myself into a world of pain by working on the "master" branch and then trying to "git pull" the latest changes back in. 

I *think* standard procedure should be to always work in your own branch and then merge your commits to the master? And if you don't have commit rights, your private branch also saves you the "git pull" problems. 
This is different from svn, which is probably why old farts like me didn't get it at first...

------Original Message------
From: Christian Mollekopf
To: KDE PIM
ReplyTo: KDE PIM
Subject: [Kde-pim] Re: Pushing a single commit in git
Sent: Jan 3, 2011 2:40 PM

On Monday 03 January 2011 22:07:05 Torgny Nyblom wrote:
> On Monday 03 January 2011 20.47.09 David Jarvie wrote:
> > How can I push a commit for one specific file to the git repository? I've
> > committed various changes locally, but I currently only want to push one
> > of them to the kdepim repository. I've looked at git help and several
> > cheat sheets etc, but can't find how to do it.
> 
> As far as i know you cannot :( One reason to use local branches, something
> I always remember after the fact that needed one :)
just make "git stash" which will save all your uncommited changes, and reset 
all files to the latest commit. You can then commit.

Afterwards reapply your changes with "git stash apply"
> 
> /Regards
> Torgny
> _______________________________________________
> KDE PIM mailing list kde-pim at kde.org
> https://mail.kde.org/mailman/listinfo/kde-pim
> KDE PIM home page at http://pim.kde.org/
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/


Sent on the TELUS Mobility network with BlackBerry
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/