search

safijari / jack-of-some

Suggestions/issues repository for my Youtube (https://www.youtube.com/c/jackofsome)
10 stars 0 forks source link

Magit + Spacemacs (Absolute Minimum) #2

Closed safijari closed 5 years ago

safijari commented 5 years ago

Pre reqs: some knowledge of git

I want to show everything from how to commit specific pieces of code to how to resolve merge conflicts.

safijari commented 5 years ago

check git status

look at diffs for files

stage file/hunk

commit

push to remote

change branch

make new branch

fetch/pull/merge

deal with merge conflicts

stash and apply

tag, push tags

git blame