Everything in ALLCAPS should be considered something you think about before typing.
- 1 Checking out a project
- 2 Creating a new local branch that tracks a remote branch
- 3 Switching which branch you are on
- 4 Making a local branch available as a remote branch
- 5 Undo local changes to a file
- 6 Configuring git to push a particular local branch to a particular remote branch every time you call "git push"
- 7 Deleting a remote branch
- 8 Adding a new version of a submodule to the git index
- 9 Undoing a git-add
- 10 Pushing tags
- 11 cgit tips and tricks
Checking out a project
git clone PROJECT_URL git branch -a # Take a look at all the remote branches you can pick from.
Creating a new local branch that tracks a remote branch
Assuming you want to pull from the remote called "origin":
git branch --track LOCALFUN origin/REMOTE_BRANCH_NAME git checkout LOCALFUN git pull # You should see, "Already up-to-date." git push # You should see, "Everything up-to-date"
The push does nothing. :-(
Switching which branch you are on
git checkout <BRANCH_NAME>
NOTE: Do not use this to create branches!
Making a local branch available as a remote branch
To make the branch BRANCH_NAME appear as a remote branch called BRANCH_NAME:
git push origin BRANCH_NAME
If you want to change the branch name:
git push origin LOCAL_BRANCH_NAME:REMOTE_BRANCH_NAME
Undo local changes to a file
Have you changed FILE in a way that you never want to commit? Just check out the version in the current HEAD with:
git checkout FILE
Configuring git to push a particular local branch to a particular remote branch every time you call "git push"
Edit .git/config. Look for [remote "origin"].
Inside there, add:
push = refs/heads/LOCAL_BRANCH_NAME:refs/heads/REMOTE_BRANCH_NAME
Two important notes:
- You may have as many push lines as you like. Every "git push" with no arguments will push all of them.
- LOCAL_BRANCH_NAME and REMOTE_BRANCH_NAME are often the same, but naturally do not have to be.
Deleting a remote branch
git push origin :BRANCH_NAME_TO_DELETE
Adding a new version of a submodule to the git index
cd path/to/submodule git checkout origin/WHICHEVER_BRANCH_YOU_WANT cd .. # top level of project git add path/to/submodule # NOTE: No trailing slash!
Undoing a git-add
will clear out your index, in case you git-add'd something that you didn't want to.
git-push does not automatically push any tags you may have created. For this, use
git push --tags
cgit tips and tricks
If you want to view a diff of changes to a file between arbitrary revisions you can formulate a URL like:
If you want to view a file in the tree as it appeared at a given commit you can formulate a URL like: