Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "Orion/Documentation/User Guide/Tasks/Working with Git"
< Orion | Documentation | User Guide
(→Committing Changes) |
(→Fetching and Merging from a Remote) |
||
| Line 24: | Line 24: | ||
** Click <b>Fetch</b> in the <b>Commits</b> section to fetch the remote tracking branch for the current branch. Click <b>Merge</b> to merge with the local branch. | ** Click <b>Fetch</b> in the <b>Commits</b> section to fetch the remote tracking branch for the current branch. Click <b>Merge</b> to merge with the local branch. | ||
** Locate a particular branch in the <b>Branches</b> section and click <b>Fetch</b> to fetch that branch. Click <b>Merge</b> to merge with your active branch. | ** Locate a particular branch in the <b>Branches</b> section and click <b>Fetch</b> to fetch that branch. Click <b>Merge</b> to merge with your active branch. | ||
| − | * Go to the [[Orion/Documentation/User Guide/Reference/ | + | * Go to the [[Orion/Documentation/User Guide/Reference/Git Status page|Git Status page]] and click on the <b>Fetch</b> and <b>Merge</b> buttons shown in the [[Orion/Documentation/User Guide/Reference/Git Status page#Commits area|Commits Area]] on the page. |
== Pushing to a Remote == | == Pushing to a Remote == | ||
Revision as of 16:07, 17 October 2012
Contents
- 1 Working with Git
- 1.1 Cloning a Repository
- 1.2 Committing Changes
- 1.3 Fetching and Merging from a Remote
- 1.4 Pushing to a Remote
- 1.5 Working with Branches
- 1.6 Rebasing Changes
- 1.7 Making a Patch
- 1.8 Applying a Patch
- 1.9 Finding a Commit
- 1.10 Preparing a Code Contribution for Review
- 1.11 Reviewing a Code Contribution
- 1.12 Storing Credentials
- 1.13 Comparing Changes in the Repository History
Working with Git
Cloning a Repository
- Go to the Repositories page
- Click Clone Repository in the tool bar.
- Type or paste in the URL for the repository in the prompt.
- By default, a folder will be created using the name of the Git repository. Press Enter or click Submit to get the default folder.
- Click the <More> button in the prompt if you wish to provide a different name or clone the repository into an already existing folder.
- Press the Esc key to cancel the clone if you change your mind.
Committing Changes
- Go to the Git Status page
- Click on each change to compare the changes and stage them.
- 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.
- Go to the Repositories page and click the Pull icon.
- Go to the Repository detail page.
- Click Pull in the toolbar to pull the respository.
- 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.