Specific use cases

External links

• How to make Git preserve specific files while merging

Git detached work tree

$ GIT_WORK_TREE=/var/www/www.example.org git checkout -f

References:

• http://toroid.org/ams/git-website-howto

Partial Clone / remove old commits

reference

git clone --depth <n> <url>
git clone  --single-branch

different remotes for pull and push

• http://stackoverflow.com/questions/2916845/different-default-remote-tracking-branch-for-git-pull-and-git-push

git remote set-url --push

• https://technosorcery.net/blog/2011/12/26/how-i-use-different-fetch-and-push-urls-in-git/

Merge customization

Merge is controlled by

• strategy
• drivers

Automatic merge is performed by external programs called 'merge drivers'.

Built-in drivers

• text -- show ancestor version : config variable merge.conflictstyle=diff3
• binary - keep the version on the current branch in worktree, but leave path in conflict (for manual merge)
• union

Configure a custom merge driver

• On PATH: git-merge-mydriver
• .git/config:

merge.mydriver.driver=git-merge-mydriver %O %A %B

• .gitattributes:

filename merge=mydriver

refs

• post explaining merge drivers/strategy
• sample: merge driver for PO files
• https://git-scm.com/docs/gitattributes : merge

Diff customization

• diff driver
• text diff on binary files (pre-diff filter)

refs:

• https://git-scm.com/docs/gitattributes : diff