More advanced Git operations are covered, including reverting commits with git revert, interactively rebasing commits with git rebase, cherry-picking commits from other repositories, stashing unfinished changes, cleaning untracked files, and using tags, reflogs, and bisect to track down bugs. Additional tricks like git grep, customizing the command prompt, and viewing diffs are also demonstrated.

1. Git Basics II
Credit to Git (http://git-scm.com/book)
http://byte.kde.org/~zrusin/git/git-cheat-sheet-medium.png

2. More git operations!
● There are a lot more git operations
available than was covered last session
● To see them all, git help -a
● We will cover a few more of them this class

3. git revert
• Remember those hashcodes seen in a log?
Any commit or merge can be reverted by
using git revert <hashcode>.
• Merges, remember to use -m # as a
parameter. -m1 specifies the parent, -m2
specifies the 2nd mainline
• Reverts may require conflict resolution.

4. git rebase
First, a warning:
Make every effort not to rebase after you’ve
pushed commits to a public repo. Other devs
may get pissed!

5. A detour - revision notation
HEAD pointer
^ - parent operator (difference between ^^
and ^#)
~ - depthwise operator
<between>..<and> - ranges and sets

6. git rebase
ex. git rebase --interactive HEAD~5
Rewinds and reapplies commits
Lists the commits to be rebased, select from
options to rebase
p = pick (use commit) s=squash (combine)
r = reword (commit message) f=fixup
e = edit (amend) x=exec

7. More git commit options

8. Cherry-picking
Picking individual commits/merges from repo
Using gerrit or github
• Requires a defined remote
• Sequence is fetch, cherry-pick,(auto)merge
• Ex: git fetch
https://gerrit.omnirom.org/android_frame
works_base refs/changes/58/6658/1 && git
cherry-pick FETCH_HEAD

9. git stash
Takes your workspace and all the changed
files and saves onto a stack of unfinished
changes
• git stash
• git stash list
• git stash apply
• git stash pop

10. git clean
Remove untracked files from the working
tree.
-d also remove untracked files
-f force
For those who like to derp: --i, --dry-run

11. More tricks using git
git log --branches --not --remotes --oneline
git diff --word-diff
git status -sb
PS1='[u@h W$(__git_ps1 " (%s)")]$ '
git cherry -v <branch>

12. git grep
Print lines in a repository matching a pattern
git grep <regexp>

13. git tag
Place a descriptive tag at this point in the
history.
Good for identifying major releases - Google
uses this profusely for AOSP
git tag build6; git push th build6

14. git reflog - the ultimate derp fixer!
Gives you a concise history of all your
changes, whether they be merges, rebases,
reverts, commits
If you make a mistake, you can always try
merging in a reflog tag!
Example...

15. Using git bisect to track bugs
git bisect does a binary search through your
command history
git bisect start
git bisect bad
git bisect good [<commit id>]
git bisect reset