Git_History.md

Git History

https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

Change multiple commits: git rebase -i HEAD~<number of commits>

'git pull --rebase --autostash' - this automatically stashes your local changes, pulls in new changes (and rebases if needed), and then pops the changes back off the stash.

Add repo to subdirectory

• https://ahmadatwi.me/2016/04/07/how-to-move-a-git-repository-to-subdirectory-of-another-repository/comment-page-1/

• add to separate branch

• rebase it and rewrite history

Force push Subtree

git push <remote> `git subtree split --prefix <local-folder> <local-branch>`:<remote-branch> --force

• https://clontz.org/blog/2014/05/08/git-subtree-push-for-deployment/