Skip to content

Instantly share code, notes, and snippets.

@jajeffries

jajeffries/git-kata-notes.md

Created August 16, 2016 12:34
Show Gist options
  • Save jajeffries/090cfe25043d82e21feb20e58ffe3e79 to your computer and use it in GitHub Desktop.
Save jajeffries/090cfe25043d82e21feb20e58ffe3e79 to your computer and use it in GitHub Desktop.
Download ZIP
Notes from XP Manchester Git Kata
Raw
git-kata-notes.md

git kata notes

prefer git pull --rebase to git pull

git config --global alias.up "pull --rebase"

git up

git commit --amend change last commit

git rebase -i <up to commit> then use pick, squash, fixup, reword etc to modify history

git log --pretty=oneline shows log on one line. Could be a good one to alias as lol :)

git config -e --global edit global config: add aliases etc.

git merge --no-ff forces you ot have a merge commit so that you can undo a branch in one revert

Look at git save and wipe from Gary's gist (https://gist.github.com/garymcleanhall)

  • git wipe then git checkout <wiped commit> to go to detached mode for wiped commit

Lookup gitkraken

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment