git · GitHub

git

Raw

Note: only rebase local branches, NEVER REBASE A REMOTE BRANCH.

create backup to preserve original commit tree

git branch myBackup

get list of commits and their SHA

git --no-pager log --oneline

start interactive rebase on targetSHA

git rebase -i <targetSHA>^

determine what to do with each commit & continue: keep, edit, etc. (git will show you the options)

Raw

dangling commits and cherry-picking.md

to find recent dangling commit

git reflog

this dangling commit can be inserted back

git cherry-pick <hash>

to cherry-pick without automatically committing

git chery-pick -n <hash>

Raw

git-log.md

from https://coderwall.com/p/euwpig/a-better-git-log

configure

git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"

usages:

git lg
git lg -p to see line changes

Raw

splitting up a commit.md

Tip: practice this on a throwaway project to get a better grasp.

create a backup

git branch backup-in-case-of-screwup

to split up the commit of current rebase step

git reset HEAD^
git stash save "split this up into multiple commits"

make the changes

git stash apply
modify lines,
git add,
git commit

get back the original state of the rebase step

git stash apply <myStash>

repeat until nothing to commit
if you are done with the current rebase step

git rebase --continue

if you want to abort rebase

git rebase --abort

if rebase finished and it was not what you wanted

git reset myBackup --hard

Raw

stashing.md

to include untracked files

git stash save --include-untracked "<myDescription>"

to include everything, even files/folders in .gitignore

git stash --all "<myDescription>"

nrninsane/basic rebase.md

Select an option

No results found

Select an option

No results found