Version 15 (modified by johnnyg, 12 years ago) (diff) |
---|
Git Tips
Tips
- Apply a commit to multiple branches
- Ignore changes in a tracked file
- Stash untracked files
- Merge a remote branch
- Delete the last commit
- Delete a remote branch
- Merge a topic branch
This page is a collection of useful git tips.
Apply a commit to multiple branches
- Checkout master branch
git checkout master
- Make commit
git commit -m "Fixed bug"
- Checkout stable branch
git checkout stable
- Apply the last commit from master to this branch
git cherry-pick master
- Repeat steps 3-4 as necessary
- PROFIT!
Ignore changes in a tracked file
To ignore:
git update-index --assume-unchanged <tracked-file>
To stop ignoring:
git update-index --no-assume-unchanged <ignored-tracked-file>
Stash untracked files
At times you will be working on a branch with untracked files (new files) and you'll need to checkout master to apply a bug fix.
First, add the untracked files to the index:
git add <untracked-files>
Now do a regular stash:
git stash
At this point you can checkout whatever branch you want and do what you need to do. When you're done, checkout your original working branch again and pop the changes from your stash:
git stash pop
You can remove the files you indexed from the index if you want, as to not pollute your next commit:
git rm --cached <files>
Merge a remote branch
First, add the repo:
git remote add <reponame> <location>
Now fetch in the changes:
git fetch <reponame>
You'll want to do a diff against your branch to see what will be merged:
git diff master <reponame>/<branch>
If you're happy with the changes, go ahead and merge it:
git merge <reponame>/<branch>
Delete the last commit
git reset --hard HEAD~1
Delete a remote branch
git push <repo> :<branch>
or
git push --delete <repo> <branch>
Merge a topic branch
In this example we assume that your topic branch, <topic>, is off master and that you are currently in your topic branch
- Squash/reword/edit any commits if need be
git rebase -i master
- Rebase your topic branch on top of current master
git rebase master
- Change to master
git checkout master
- (Fast-forward) merge your topic branch into master
git merge <topic>
- Delete your local topic branch (see above tip for remote deletion)
git branch -d <topic>