Conclusion
Git handles history for you :)
Merge branch 'master' of github.com:sr04/mipv6