Skip to content

Latest commit

 

History

History
37 lines (31 loc) · 830 Bytes

notes.md

File metadata and controls

37 lines (31 loc) · 830 Bytes

Presenter notes

Intro slides

Walkthrough

https://github.com/degnbol/BioInfoSummer2022/blob/main/walkthrough.md

Open a finder window. Open src/myscript.py to show branch switching.

Extra time

Open e.g. README.md with :set number

  • gitsigns (GUIs have similar)
  • git blame. gb
  • move between hunks. ]h [h
  • show diff (default to HEAD). gd
  • reset hunk. gr. Undo this with u
  • stage a hunk. gs
  • undo stage. gu
  • stage selection. visual + gs
  • Stage file with :G stage %
  • Commit with :G commit -m "fugitive" (or no message)
  • :G push

Merge tool:

git reset --hard ':/conflict'
git reset --hard HEAD~
git checkout ':/os'
git switch -c dev
git switch main
git merge dev
vi src/myscript.py +'DiffviewOpen -uno' +DiffviewToggleFiles
git merge --abort
git pull