meta data for this page
  •  

This is an old revision of the document!


merge

merge conflicts

git checkout --ours PATH/FILE
git checkout --theirs PATH/FILE

Make repo from one dir (change root method)

Remove files from history (rewriting)

Iterate through history and remove all files mathcing pattern:

git filter-branch --tree-filter 'rm -f m* z* x* w* s* r*' --prune-empty  HEAD