git squash

gistfile1.txt

disable auto gc
in .gitconfig file:
[gc]
        auto = 0

git checkout master
git pull
git checkout your_branch
git reset --soft commit_hash_before_your_changes //(can be found by doing git log)
git stash
git merge master --ff
git stash apply
git commit
git push -f origin your_branch