Exploring Git from the Bits Up and Advanced Android Development
Table of Contents
- 1. Sessions
- 1.1. Git from the Bits Up by Tim Berglund friday
- 1.2. Advanced Android Development by James Harmon friday
- 1.3. JavaScript Design Patterns by Pratik Patel friday
- 1.4. Continuous Delivery All-day Workshop, Pt. 1: Deployment Pipelines by Neal Ford saturday
- 1.5. Continuous Delivery All-day Workshop, Pt. 1: Deployment Pipelines by Neal Ford saturday
- 1.6. Rich Web Apps with Angular by Raju Gandhi saturday
- 1.7. Scala: Demystifying The Funky Stuff by Daniel Hinojosa saturday
- 1.8. Simulation Testing with Simulant by Stuart Halloway sunday
- 1.9. Generative Testing by Stuart Halloway sunday
- 1.10. Get things DONE! by Raju Gandhi sunday
- 1.11. Get Logical with Datalog by Stuart Halloway sunday
- 2. Tasks
1. Sessions
1.1. Git from the Bits Up by Tim Berglund friday
1.1.1. Commit without Commit
git help config | grep pack
1.1.2. Rebasing
Draw arrows in the direction of time but in practice this is reversed.
Rebasing is effectively taking the branch, pulling it off the parent, and . fast-forward merge is permitted trivially by applying a label after the rebasing to master.
A rebase looks like a merge only from the perspective of the working tree: files will be exactly the same if you were introduced to work in progress.
HEAD is always the commit you're currently on. What to do to manage
git lol git reset # soft and hard