git-filter-repo

gistfile1.txt

## git-filter-repo

- Stage a working area. These are somewhat throwaway directories and local git repos.
- clone both source and target repos.
```
mkdir my-working-dir
cd my-working-dir
git clone [email protected]:bonovoxly/source.git
git clone [email protected]:bonovoxly/target.git
```

### In source repo

We checkout a branch that we will filter against. We specify the path(s) that we want.

```
cd ./source
git checkout filter-source
git filter-repo --path ansible/ansible.cfg --path ansible/file.yml --path ansible/another-file.yml --refs refs/heads/filter-source --force
```

## In target repo

```
cd ../target
git checkout -b filter-target
git remote add repo-source ../source
git fetch repo-source
git branch branch-source remotes/repo-source/filter-source
git merge branch-source --allow-unrelated-histories
```

Thank you for publishing this!

I ran into some gotchas:

1. Install git-filter-repo
2. If you need to move files into a different directory structure or rename them, make sure to do this in a separate, isolated commit -- don't include any other changes in that commit!
3. To view the pretty git history made possible by your gist: git log --follow $FILEPATH

#3 will allow you to see the git history of the file after it has been renamed, so long as you follow #2

This is by far the most elegant solution I found to merge git histories. However, I am having problems with LFS files for the final git merge:

Error downloading object: XXX: Smudge error: Error downloading XXX Not Found: [404] Not Found

error: external filter 'git-lfs-filter-process' failed
fatal: XXX: smudge filter lfs failed.

Any idea how to work around that?

FYI both source.git and target.git have LFS working correctly.