Topics

• Getting started with Android
• Layouts
• Exceptions
• Staging
• Ignoring Files and Folders
• Undoing
• Aliases
• Hooks
• Stashing
• Migrating to Git
• External merge and difftools

Examples

• Stage deleted files
• Simple aliases
• Add changes by hunk
• Temporarily ignore tracked files
• Setting up KDiff3 as merge tool
• Setting up KDiff3 as diff tool
• Setting up an IntelliJ IDE as merge tool (Windows)
• Setting up an IntelliJ IDE as diff tool (Windows)