On 07/26/2017 10:25 AM, Thomas Klausner wrote:
On Wed, Jul 26, 2017 at 10:33:28AM +0000, coypu%sdf.org@localhost wrote:You need to have your tree without any unstaged changes, all the changes in commits, and in sync with the upstream tree, in order to push. if you don't want to commit some changes that exist, you can use 'git stash' to temporarily get rid of any unstaged changes. If what you want is to push all the commits you have tracked (visible in git log), then you: git stash # gets rid of any local untracked changes git pull -r # sync to upstream tree git push origin master # push your local commitsgit stash pop # restores your local uncommitted changes. Thomas
Wow! I added that link to xkcd in a semi-humorous way but this thread is showing me how real it is.
Here is exactly what I did. 1. git clone darcy%wip.pkgsrc.org@localhost:/pkgsrc-wip.git wip 2. cd wip 3. vi Makefile [remove pkgin] 4. git rm -r pkgin 5. git commitWhen I ran that last command there were no changes except the ones that I wanted to commit. So do I still have to do some git push/pull/stash/abra-cadabra command before the commit? I can't even do a pull because I have those changes that I am trying to commit. Doing any of those other commands being suggested just sends me on a circular path.
I still think that we need to move away from CVS but I think that I just moved back into the Subversion camp.
-- D'Arcy J.M. Cain <darcy%NetBSD.org@localhost> http://www.NetBSD.org/ IM:darcy%Vex.Net@localhost