~/talk

How Effective Teams Use Git

Talkat NDC DevOps 2020 · 2020-03-11..03-13· [developer-experience]
links:none on file
slides:none on file

Practical Git habits and exact settings: enable a Git-aware prompt like starship, use diff‑so‑fancy via git config core.pager, set core.whitespace and use rebase -Xwhite-space=fix to auto-fix trailing spaces, use merge.conflictStyle=d3 for three‑way conflicts, set core.excludesfile for global ignores and push.followTags=true. Commit strategy is A C I D (autonomous via git add -p, compatible via stash --keep-index or git rebase --exec to run builds, incremental via interactive rebase, documented 50‑char subject enforced by commit-msg hook). Branch rules: private topic branches, public long‑running with merge commits, map branches to environments.

AI-written summary · about

  1. 0:00Start
  2. 6:43Get Comfy
  3. 12:56Readable Patches
  4. 14:53Whitespace Handling
  5. 15:11Whitespace Handing
  6. 18:23Better Conflict Handling
  7. 21:31Global ignores
  8. 26:26Craft Your History
  9. 32:06Compatible
  10. 41:23Documented
  11. 44:18Automate!
  12. 44:32Allased Functions
  13. 47:07Auto This and Auto That
  14. 50:25Client Side Hools
~/search
type to search 6,249 conferences, 138,987 speakers and 185,172 talks
~/help
cmdctrl k
search every conference, speaker and series
/
focus the filter search
h
home
c
conferences
s
speakers
e
series
t
light / dark — the status bar button does the same
?
this help
esc
close this, then clear every filter — or just the search, while you are typing in it

Ignored while you are typing. Pages without a filter rail have no search to focus.