There have been multiple accounts created with the sole purpose of posting advertisement posts or replies containing unsolicited advertising.

Accounts which solely post advertisements, or persistently post them may be terminated.

expr ,

No, there are no fast-forwards with rebasing. A rebase will take take the diff of each commit on your feature branch that has diverged from master and apply those each in turn, creating new commits for each one. The end result is that you have a linear history as though you had branched from master and made your commits just now.

If you had branched like this:


<span style="color:#323232;">A -> B -> C (master)
</span><span style="color:#323232;">   
</span><span style="color:#323232;">      -> D (feature)
</span>

It would like this after merging master into your feature branch:


<span style="color:#323232;">A -> B -> C (master) ->   E (feature)
</span><span style="color:#323232;">                                      /
</span><span style="color:#323232;">     -> D -------------------> /
</span>

And it would like this if you instead rebased your feature branch onto master:


<span style="color:#323232;">A -> B -> C (master) -> D' (feature)
</span>

This is why it’s called a “rebase”: the current state of master becomes the starting point or “base” for all of your subsequent commits. Assuming no conflicts, the diff between A and D is the same as the diff between A and D’.

  • All
  • Subscribed
  • Moderated
  • Favorites
  • [email protected]
  • random
  • lifeLocal
  • goranko
  • All magazines