git rebase

See also

• https://git-scm.com/docs/git-rebase

• git cherry-pick

• Writing for a clean history (git rebase)

• https://git-scm.com/book/en/v2/Git-Branching-Rebasing

• https://help.github.com/articles/about-git-rebase/

• https://help.github.com/articles/using-git-rebase-on-the-command-line/

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

Patching commands

git rebase –interactive HEAD~<number_of_local_commits>

git rebase --interactive HEAD~<number_of_local_commits>

Examples

• git rebase master 3.1.1

• git rebase -i HEAD~2 (Historique propre)

• git rebase examples
  • git rebase example 1

Rebase our current branch onto another branch

To rebase the ‘feature’ branch onto ‘dev’ branch :

git checkout feature
git rebase dev

Then, the next time you will push your code to the remote repository, you will have to force the push in order to rewrite the git history.

git push --force