Skip to content

Add entry for git rebase #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PuneethaPai wants to merge 1 commit into
base: gh-pages
Choose a base branch
from
Open

Add entry for git rebase #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<li><a href="#branch">Git Branch</a></li>
<li><a href="#checkout">Git Checkout</a></li>
<li><a href="#merge">Git merge</a></li>
<li><a href="#rebase">Git rebase</a></li>
<li><a href="#reset">Git Reset</a></li>
<li><a href="#github">GitHub</a></li>
<li><a href="#goodbye">Goodbye!</a></li>
Expand Down Expand Up @@ -210,6 +211,19 @@ <h3>Merge dem files!</h3>
</div>
</div>
</div>
<div class="container mehroon" id="rebase">
<div class="row">
<div class="twelve columns" style="margin-top: 10%">
<h3>Rebase your Work!</h3>
<p>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 <code>branch_name</code>:</p>
<pre>git rebase branch_name</pre>
<p>Usually in branch based approach, each feature/individual develops in different branch, diverging from a parent branch, say <code>master</code>. You would need to stay up to date with respect to parent branch <code>master</code> and apply your commits on top of it. This can be done in a single command as:</p>
<pre>git pull origin master --rebase</pre>
<p>Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified:</p>
<pre>git rebase -i target_base_branch_or_commit_hash</pre>
</div>
</div>
</div>
<div class="container light-blue" id="reset">
<div class="row">
<div class="twelve columns" style="margin-top: 20%">
Expand Down