Jump to: navigation, search

Difference between revisions of "Orion/Documentation/User Guide/Tasks/Working with Git"

Line 42: Line 42:
  
 
== Rebasing Changes ==
 
== Rebasing Changes ==
 +
When you have been making commits in a topic branch, with the intention of pushing te code into a different branch, it is often useful to rebase those commits on another branch.  Rebasing will make your commits appear as if the changes were made based on the code in another branch.
 +
# First ensure that all of your changes are committed to your topic branch.  This is typically done on the [[Orion/Documentation/User Guide/Reference/Git Status page|Git Status page]].
 +
# Go to the [[Orion/Documentation/User Guide/Reference/Repositories page#Repository detailed view|Repository detail page]] and look for the branch you wish to rebase on in the <b>Branches</b> section.  If the branch is not visible, click <b>View All</b> to see all local and remote branches.
 +
# Now make sure that the branch you wish to rebase on is up to date.  If you are rebasing on a remote branch, you will want to <b>Fetch</b> that branch.  If you are rebasing on a local branch, you will want to temporarily make that branch current, and fetch and merge the branch.
 +
# When you are sure that the branch you are rebasing upon is up to date, then [[Orion/Documentation/User Guide/Reference/Repositories page#Setting the active branch|checkout]] checkout your topic branch (if it is not already the active branch) to make it active.
 +
# Now find the other branch in the list and click on the <b>Rebase</b> icon.
 +
[[Image:Orion-tasks-rebase.png|Rebasing a branch]]
  
 
== Making a Patch ==
 
== Making a Patch ==

Revision as of 10:44, 18 October 2012

Working with Git

Cloning a Repository

  1. Go to the Repositories page
  2. Click Clone Repository in the tool bar.
  3. Type or paste in the URL for the repository in the prompt.
    1. By default, a folder will be created using the name of the Git repository. Press Enter or click Submit to get the default folder.
    2. Click the <More> button in the prompt if you wish to provide a different name or clone the repository into an already existing folder.
    3. Press the Esc key to cancel the clone if you change your mind.

Clone a repository

Committing Changes

  1. Go to the Git Status page
  2. Click on each change to compare the changes and stage them.
  3. Commit the staged changes to your repository.

Fetching and Merging from a Remote

You may fetch and merge from a remote from a number of different Orion pages.

Pull a repository

  • Go to the Repository detail page.
    • Click Pull in the toolbar to pull (fetch and merge) the repository. Changes are merged into your active branch.
    • Click Fetch in the Commits section to fetch the remote tracking branch for the current branch. Click Merge to merge with the local branch.
    • Locate a particular branch in the Branches section and click Fetch to fetch that branch. Click Merge to merge with your active branch.
  • Go to the Git Status page and click on the Fetch and Merge buttons shown in the Commits Area on the page.
  • Go to the Git Log page for the remote branch and click on the Fetch and Merge buttons in the toolbar.

Pushing to a Remote

You may push to a remote from a number of different Orion pages.

  • Go to the Repository detail page.
    • Click Push All in the Commits Section on the page. This will push changes in the current branch to its remote tracking branch.
  • Go to the Git Status page and click on the Push All button shown in the Commits Area on the page.
  • Go to the Git Log page for the local branch and click on the Push All button in the toolbar. In rare cases, you may want to use the Force Push All button to override the remote tracking branch content with your local branch content.

Switching between Branches

  1. Go to the Repository detail page.
  2. The Branches section on the page will show you your most recently used branches.

Branches section

  1. Click View All to see a list of all local and remote branches.
  2. You can checkout different branches, fetch, merge, rebase, and reset various branches. See Working with branches in the reference documentation for examples of these actions.

Rebasing Changes

When you have been making commits in a topic branch, with the intention of pushing te code into a different branch, it is often useful to rebase those commits on another branch. Rebasing will make your commits appear as if the changes were made based on the code in another branch.

  1. First ensure that all of your changes are committed to your topic branch. This is typically done on the Git Status page.
  2. Go to the Repository detail page and look for the branch you wish to rebase on in the Branches section. If the branch is not visible, click View All to see all local and remote branches.
  3. Now make sure that the branch you wish to rebase on is up to date. If you are rebasing on a remote branch, you will want to Fetch that branch. If you are rebasing on a local branch, you will want to temporarily make that branch current, and fetch and merge the branch.
  4. When you are sure that the branch you are rebasing upon is up to date, then checkout checkout your topic branch (if it is not already the active branch) to make it active.
  5. Now find the other branch in the list and click on the Rebase icon.

Rebasing a branch

Making a Patch

Applying a Patch

Finding a Commit

Preparing a Code Contribution for Review

Reviewing a Code Contribution

Storing Credentials

Comparing Changes in the Repository History