meta data for this page
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| git:merge [2020/01/29 14:14] – niziak | git:merge [2022/02/04 11:42] (current) – niziak | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| + | ====== merge ====== | ||
| ====== merge conflicts ====== | ====== merge conflicts ====== | ||
| Line 7: | Line 8: | ||
| </ | </ | ||
| - | |||
| - | ====== Make repo from one dir (change root method) ====== | ||
| - | |||
| - | ====== Remove files from history (rewriting) ===== | ||
| - | |||
| - | Iterate through history and remove all files mathcing pattern: | ||
| - | <code bash> | ||
| - | git filter-branch --tree-filter 'rm -f m* z* x* w* s* r*' --prune-empty | ||
| - | </ | ||