Re: [git-users] Can I use GitHub ?

2013-08-30 Thread Kyle Gordon
Hi, Yes, you should be able to integrate Eclipse with Github, using the Git plugin here http://eclipse.github.com I'm not an Eclipse user, so I can't say much more than that, although I do know the Android Studio application also has Github integration built in to it. I downloaded a Github

Re: [git-users] error during git pull

2013-08-30 Thread Huu Da Tran
Instead of doing: git pull remotename remotebranch Try: git fetch remotename remotebranch git checkout remotename/remotebranch git log conflictingfile You will still need to rename the file prior to do this. Hope this helps. HD. -- You received this message because you are

[git-users] Re: git log takes lot of time

2013-08-30 Thread dexter ietf
On Friday, August 30, 2013 11:21:05 AM UTC+5:30, Thomas Ferris Nicolaisen wrote: On Thursday, August 29, 2013 6:52:38 PM UTC+2, dexter ietf wrote: this is my git repo size, why does git log takes such huge time and how do i improve the time. real 0m35.603s user0m08.093s sys

[git-users] git branch : strange !

2013-08-30 Thread djsuperfive
Hi ! I'm learning git and have a strange issue with a simple branch scenario: I created a new local branch dev. So now I have two local branches: master and dev.On master, everything isup to date: nothing to add, nothing to commit. I've checked out the branch dev and made a change in one file.

Re: [git-users] git branch : strange !

2013-08-30 Thread Gergely Polonkai
Hello, braches hold only commited changes (actually, they are pointers to one specific commit). Uncommited changes travel between checkouts (well, unless the target branch is in a totally different state, as then you will face even stranger merge issues). So take this advise: never checkout

Re: [git-users] git branch : strange !

2013-08-30 Thread William Seiti Mizuta
Hi, git doesn's save changes in a branch. Only commits are saved in an specific branch. So, if you have a change in a file and change the branch, this change will be at the new branch. If you don't want it, you need to commit or stash the change before changing branch. If changing a branch will

Re: [git-users] git branch : strange !

2013-08-30 Thread Dale R. Worley
From: djsuperfive maximefresch...@gmail.com Why do I have a change to add on master whereas I made this change on my branch dev ? I think I can explain this more clearly: You changed a file, but since you didn't add or commit it, none of the branches is affected. git-status is just telling

Re: [git-users] Can I use GitHub ?

2013-08-30 Thread TC Wan
On Friday, August 30, 2013 2:36:30 PM UTC+8, Kyle Gordon wrote: Hi, Yes, you should be able to integrate Eclipse with Github, using the Git plugin here http://eclipse.github.com I am using the latest version of Eclipse CDT Kepler which comes with Git support already built in. It works