meta data for this page
  •  

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
git:merge [2017/02/20 12:58] – niziakgit:merge [2022/02/04 11:42] (current) – niziak
Line 1: Line 1:
 +====== merge ======
  
 +====== merge conflicts ======
  
-====== Make repo from one dir (change root method) ====== 
- 
-====== Remove files from history (rewriting) ===== 
- 
-Iterate through history and remove all files mathcing pattern: 
 <code bash> <code bash>
-git filter-branch --tree-filter 'rm -f m* z* x* w* s* r*' --prune-empty  HEAD+git checkout --ours PATH/FILE 
 +git checkout --theirs PATH/FILE
 </code> </code>
 +