##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
api: comment_pull_request, added commit_id parameter to validate status changed on particular commit....
api: comment_pull_request, added commit_id parameter to validate status changed on particular commit. - when using the API and creating a comment with status change it's now possible to pass in commit_id, this will allow validation if status change of pull_request is allowed based on the given commit_id. This solves the case when long running test sends approval of pull request which was already updated several times. The commit_id will now validate for which state the approval was made, and prevent accidental aproval of outdated pull requests.
marcink - - Load All Authors

File last commit:

r1:854a839a default
r1269:26e59d48 default
Show More
rebase-commits-git.rst
54 lines | 1.4 KiB | text/x-rst | RstLexer
/ docs / tutorials / rebase-commits-git.rst
History | Annotation | Raw |Copy content |Copy permalink

How to Rebase in |git|

Rebasing can take two form in |git|.

  • Rebasing changes when you pull from upstream
  • Rebasing one branch on top of another

If you need to understand more about branching, and the terminology, see the :ref:`branch-wf` section.

Rebasing When Pulling from Upstream

This will pull any changes from the remote server, and rebase the changes on your local branch on top of them.

# Move to the branch you wish to rebase
$ git checkout branchname

# Pull changes on master and rebase on top of latest changes
$ git pull --rebase upstream master

# Push the rebase to origin
$ git push -f origin branchname

Rebasing Branches

Rebasing branches in |git| means that you take one branch and rebase the work on that branch on top of another. In the following example, the triple branch will be rebased on top of the second-pass branch.

  1. List the available branches in your |repo|.
$ git branch
  first-pass
* master
  second-pass
  triple
  1. Rebase the triple on top of the second-pass branch.
$ git rebase second-pass triple
First, rewinding head to replay your work on top of it...
Fast-forwarded triple to second-pass.