Git tips

Update git version

• Update tutorial for git mac installation

Integrate a submodule into the parent repository

• Saving the history

• Without saving the history

• Using git stash effectively

Git version

• git --version Display the git version used

Git undoing things

• https://blog.github.com/2015-06-08-how-to-undo-almost-anything-with-git/

• https://www.atlassian.com/git/tutorials/undoing-changes

Rebasing in gitkraken

• https://www.youtube.com/watch?v=-3yqteu-pLM

Change remote url without hacking .git/config file

• git remote set-url origin https://wwwwgithub.com/awesome/awesome-project

Squash commits

• https://github.com/wprig/wprig/wiki/How-to-squash-commits

What to do in case of problems with git

• https://ohshitgit.com/

Clean our local merged branch

• https://stevenharman.net/git-clean-delete-already-merged-branches

Reapply the change after a revert : Revert the revert

• https://www.drupaldump.com/gitlab-revert-reverted-merge

Mixing rebase and merge (occasionally)

It can be useful for example if the branch has many commits and we don't want to stash and prevent multiple fix conflicts it seems to be technically possible as explained in this issue

What happens when you combine git merge and rebase?Stack Overflow

Reference a library by a commit in package.json

npm install from Git in a specific versionStack Overflow

Undoing a rebase ! (after an error) even after you pushed to remote

Undoing a git rebaseStack Overflow