~/talk

More Git and GitHub Secrets

Talkat ArrrrCamp 2013 · 2013-10-03..10-04· [developer-experience]
slides:none on file

Shows exact commands and workflows: deleting a remote branch with git branch -d local && git push origin :local, forcing a branch to win with git merge -s ours, using git merge -X patience for smarter diffs, stashing a bulky regex run then diffing against the stash to iterate safely, and fetching pull requests directly with git fetch origin pull/12/head:pr. Mentions quirks like emoji rendering fixed by --no-pager, git stripspace and diff --check, curlable user.keys, canonical URLs via pressing y, web-based file edits and the t fuzzy file finder, and that :shipit: dominates emoji use by about two to one.

AI-written summary · about

  1. 0:00Intro
  2. 3:32Merge Strategies
  3. 6:58Git Stashing
  4. 9:07Emoji
  5. 10:03Get Strip Space
  6. 10:51Get Check
  7. 11:58Trivia
  8. 12:35Get merged abort
  9. 13:08Git merge em message
  10. 13:39Git Ignore
  11. 14:27Assume Unchanged
  12. 15:27Commit Message Break
  13. 18:04Canonical URLs
  14. 19:19Public Keys
  15. 20:04Fetching Pull Requests
  16. 21:45Live Updates
  17. 22:43Trivia Break
  18. 23:46Quick Quotes
  19. 24:12Quick Reply
  20. 24:33Browsing Stars
  21. 25:00Webflow
  22. 25:48Branch Selector
  23. 26:48Issue Autocomplete
  24. 27:34Rename Repository
  25. 28:01License Repository
  26. 29:29Tasklist
  27. 31:04Fork URLs
  28. 31:40Conclusion
~/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.