Git tips

Take a look at the Git cheat sheet.

Resources:

• genomewiki
• Git scm
• Justin Hileman
• Daniel Kummer
• Git Cheatsheet
• Resources for learning Git
• Git tips from the pros

Solving merge conflicts

When merging with Git, conflicts can happen. To resolve them, simply:

1. find the conflicted files with git status (they'll have the unmerged mention)
2. edit the conflicted files and make the necessary modifications
3. git add the resolved files
4. git commit to finish the merge

Managing ref updates (checkout, reset, commit, merge, etc)

1. checking the history of ref updates: git reflog [show <branch>]
2. undoing last ref update: git reset HEAD@{1}

Source: Stack overflow: Undoing git reset

Splitting a commit

1. select the commits: git rebase -i HEAD~<number>
2. mark the commit: change pick to edit
3. save and quit the editor
4. undo the commit: git reset HEAD^
5. stage and commit: git add <file>; git commit -m <message>
6. apply the split: git rebase --continue

Source: Git scm: Splitting a commit

Join last commits into the previous one

1. select the commits: git rebase -i HEAD~<number>
2. mark the commits: change pick to fixup

Source: Git scm: Squashing commits

Reorder commits

1. select the commits: git rebase -i HEAD~<number>
2. change the order of the lines

Source: Git scm: Reordering commits

Modify commit

⚠️ These tips work for un-propagated commits

Change the last commit message

git commit --amend

Modify specific commit

1. start rebase: git rebase -i <number>^
2. mark the commit: change pick to edit
3. edit your files
4. add them git add <filepattern>
5. git commit --amend
6. And return to the head with git rebase --continue

Commit part of a file

1. select the file: git add -p <file>
2. choose what to do:
   • accept the chunk: hit y
   • reject the chunk: hit n
   • select part of the chunk: hit e, or s if available
3. save and quit the editor
4. commit: git commit -m <message>

Source: Git scm: Staging patches

Reset a local branch from remote branch

1. start fetch: git fetch <remote>
2. reset from the chosen remote: git reset --hard <remote>/<branch>
3. check you have no differences between the two branches: git diff <branch>...<remote>/<branch> should respond nothing.

Source: Git scm: Reset history

Keep a fork updated

Track the repository

1. git clone git@github.com:johndoe/knowledge.git
2. cd knowledge
3. git remote add upstream git@github.com:gnugat/knowledge.git

Update the repository

1. git fetch upstream
2. git rebase upstream/master