I use git with my friend to collaborate on a project. He created a repo in github consisting folders of each of our names, so everytime i update something, I upload it to this folder then push it to github, and so does he. So everytime there’s a new commit, we have to pull from github and copy paste the edited files to our own localhost (wamp).
So what i want to ask :
-
How do I check if there’s a new commit from git bash without checking github? Git pull will pull the latest version i know, but what if i just want to check first?
-
Say my git folder is located in D://git/project_name. Can I copy this folder to another location (for example USB Flash Disk) then do a git pull from this USB?
-
If our method isn’t effective, do you have any proposal on how we should use git? We’re using CodeIgniter framework, so at first I proposed to just git push the whole CodeIgniter folders, but my friend said it’s dangerous (cos the whole config and database is there) and unnecessary (since the main system folder will most likely be untouched). So we’re using this current method (having two folders with our names and pushing and pulling everytime there’s an update.
Answering your first two questions in turn:
originrefers to the GitHub repository in each case, you should just rungit fetch origin. Then the “remote-tracking branch”origin/masterwill be at the version of master on GitHub and you can compare it with your master withgit diff master origin/masterto see the difference between those two versions, orgit log master...origin/masterto see the commits which are unique to eithermasterororigin/master.With regard to whether there is a better way to do what you’re doing, I’m afraid I don’t understand clearly enough what you’re doing or trying to achieve to comment sensibly. However, having folders in the repository named after each developer with (presumably) very similar source code in them sounds a little suspect – you would typically use branches to deal with divergent versions of the same code.