From 12e1f4db490847cb00a3b30ec6523dccd4e88fb1 Mon Sep 17 00:00:00 2001 From: Puneetha Pai Date: Wed, 28 Oct 2020 19:57:08 +0530 Subject: [PATCH] Add entry for git rebase --- index.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/index.html b/index.html index 6cf477f..2a4b594 100644 --- a/index.html +++ b/index.html @@ -45,6 +45,7 @@
  • Git Branch
  • Git Checkout
  • Git merge
    • +
  • Git rebase
  • Git Reset
  • GitHub
  • Goodbye!
    • @@ -210,6 +211,19 @@

    Merge dem files!

    +
    +
    +
    +

    Rebase your Work!

    +

    When working in a team, you would need to apply your changes on top of others work. This process is called Rebase, where you apply your commits on top of others work/branch branch_name:

    + 
    git rebase branch_name
    +

    Usually in branch based approach, each feature/individual develops in different branch, diverging from a parent branch, say master. You would need to stay up to date with respect to parent branch master and apply your commits on top of it. This can be done in a single command as:

    + 
    git pull origin master --rebase
    +

    Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified:

    + 
    git rebase -i target_base_branch_or_commit_hash
    +
    +
    +