Differences
This shows you the differences between two versions of the page.
| Next revision | Previous revision | ||
| advanced_git [2018/06/07 12:54] – created rpjday | advanced_git [2019/03/29 11:36] (current) – [Outline] rpjday | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | ===== Work in progress | + | ===== Outline |
| * Debugging source code using Git bisection | * Debugging source code using Git bisection | ||
| * Resolving merge conflicts | * Resolving merge conflicts | ||
| - | * Advanced rebasing techniques | + | * Advanced rebasing techniques |
| * Using worktrees | * Using worktrees | ||
| * Registering and working with other remotes | * Registering and working with other remotes | ||
| * How to work with submodules and subtrees | * How to work with submodules and subtrees | ||
| + | * Using client-side hooks | ||
| * The varieties of Git workflow | * The varieties of Git workflow | ||
| * GitHub workflow | * GitHub workflow | ||
| - | * Restructuring repositories with '' | ||
| ===== Prerequisites ===== | ===== Prerequisites ===== | ||
| Line 19: | Line 19: | ||
| * how to change, stage and commit local work | * how to change, stage and commit local work | ||
| * how to undo local work with '' | * how to undo local work with '' | ||
| - | * | + | * how to create, work with and merge local branches |
| + | * how to manipulate local tags | ||