rhodecode-enterprise-ce Files · docs/tutorials/rebase-commits-git.rst

db: Set `rhodecode.is_test` in `make_pyramid_app` instead of `make_app`...

db: Set `rhodecode.is_test` in `make_pyramid_app` instead of `make_app` Based on this setting the crypto backend is selected: brypt or md5. During tests md5 is used to sppedup test execution. We have to move this setting up to the pyramid layer otherwise the test DB init will use bcrypt and the tests use md5. This will result in test users not able to login.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r118:931f58e5

default

Download file

             rebase-commits-git.rst
        
                    54 lines
            
             | 1.4 KiB
            
                | text/x-rst
            
             |
                RstLexer
            
             / docs / tutorials / rebase-commits-git.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
project: added all source files and assets

              r1
            
      .. _rebase-rebase-git:

      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.

      .. code-block:: bash

          # 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|.

      .. code-block:: bash

          $ git branch

            first-pass

          * master

            second-pass

            triple

      2. Rebase the ``triple`` on top of the ``second-pass`` branch.

      .. code-block:: bash

          $ git rebase second-pass triple

          First, rewinding head to replay your work on top of it...

          Fast-forwarded triple to second-pass.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

marcink project: added all source files and assets	r1	.. _rebase-rebase-git:

		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.

		.. code-block:: bash

		# 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\|.

		.. code-block:: bash

		$ git branch
		first-pass
		* master
		second-pass
		triple

		2. Rebase the ``triple`` on top of the ``second-pass`` branch.

		.. code-block:: bash

		$ git rebase second-pass triple
		First, rewinding head to replay your work on top of it...
		Fast-forwarded triple to second-pass.