Join Brent Laster, open-source trainer and author of Professional Git, as he surveys Git beyond the basics. This presentation will be a quick overview of various advanced (and useful) Git commands and features, including:
- Types of merges: fast-forward, three-way
- Rebasing vs. merging
- Reset and revert
- Rerere – reuse recorded resolution
- Bisect – quickly narrowing down where a change was introduced
- Subtrees
- Working trees
- Grep
Notes: Basic understanding and familiarity with Git is assumed.