git-branch

I am having some difficulty understanding how to use tags versus branches in git . I just moved the current version of our code from cvs to git , and now I'm going to be working on a subset of that code for a particular feature. A few other developers will be working on this as well, but not all developers in our group are going to care about this feature. Should I be creating a branch or a tag? In what situations should I be using one versus the other? tvanfosson A tag represents a version of a particular branch at a moment in time. A branch represents a separate thread of development that

I have the branch master which tracks the remote branch origin/master . I want to rename them to master-old both locally and on the remote. Is that possible? For other users who tracked origin/master (and who always updated their local master branch via git pull ), what would happen after I renamed the remote branch? Would their git pull still work or would it throw an error that it couldn't find origin/master anymore? Then, further on, I want to create a new master branch (both locally and remote). Again, after I did this, what would happen now if the other users do git pull ? I guess all

If I have n commits, how can I branch from the n-3 commit? I can see the hash of every commit. CB Bailey You can create the branch via a hash: git branch branchname <sha1-of-commit> Or by using a symbolic reference: git branch branchname HEAD~3 To checkout the branch when creating it, use git checkout -b branchname <sha1-of-commit or HEAD~3> OneSolitaryNoob To do this on github.com: Go to your project. Click on the "Commits". Click on the <> ("Browse the repository at this point in the history") on the commit you want to branch from. Click on the "tree: xxxxxx" up in the upper left. Just below

I want to merge two branches that have been separated for a while and wanted to know which files have been modified. Came across this link: http://linux.yyz.us/git-howto.html which was quite useful. The tools to compare branches I've come across are: git diff master..branch git log master..branch git shortlog master..branch Was wondering if there's something like "git status master..branch" to only see those files that are different between the two branches. Without creating a new tool, I think this is the closest you can get to do that now (which of course will show repeats if a file was