Skip to main content
Jump to: navigation, search

Difference between revisions of "Orion/Documentation/User Guide/Reference/Git Status page"

(Staging changes)
(Restoring a change from the index)
Line 29: Line 29:
 
[[Image:Orion-status-page-staged-all-changes.png]]
 
[[Image:Orion-status-page-staged-all-changes.png]]
  
== Restoring a change from the index==
+
== Reverting an unstaged change ==
  
Hover over any unstaged change to pop up all available action icons. Then hover over the second action. You will see the tool tip as <b>checkout</b>.  
+
Let's say you have made a change in your working copy that you want to discard. You can discard a change by performing a checkout of the file contents from your local index. Hover over any unstaged change to pop up all available action icons. Then hover over the second action. You will see the tool tip as <b>checkout</b>.  
  
 
[[Image:Orion-status-page-checkout-action.png]]
 
[[Image:Orion-status-page-checkout-action.png]]

Revision as of 15:37, 23 June 2011

Git Status page

The Git Status page provides a summary of the current state of a Git clone associated with your Orion account. This page shows changes in your working tree, staged changes that are ready to commit, and a summary of the current contents of the local and remote tracking branches. The title area indicates the repository and branch name you are currently viewing. Commands available on staged or unstaged files are shown to the right of each file when you hover over it.


Orion-status-page-overview.png

Types of changes

Excluding the conflicting cases, there are three types of changes: adding, changing and deleting. The types of changes are indicated by icons on the left of the files.

Orion-status-page-change-types.png

Comparing changes

Click any staged or unstaged change to open a comparison between the working copy and the state of that file in the most recent commit. You can also open a separate Compare page by clicking the Side by side compare button to the right of the file name. The compare page allows you to merge changes or perform further edits on your uncommitted changes.

Staging changes

Before you can commit a file in Git, it must be added to your local index. This process is called staging, or Git add. Hover over any unstaged change to pop up all available action icons. Then hover over the first action. You will see the tool tip as stage.

Orion-status-page-stage-action.png

Click on the action to stage the change. The file will be moved to the Staged area.

Orion-status-page-staged-change.png

From the top-right corner of the unstaged area, you can also click on the stage all action to stage all the changes.

Orion-status-page-staged-all-changes.png

Reverting an unstaged change

Let's say you have made a change in your working copy that you want to discard. You can discard a change by performing a checkout of the file contents from your local index. Hover over any unstaged change to pop up all available action icons. Then hover over the second action. You will see the tool tip as checkout.

Orion-status-page-checkout-action.png

Clicking on the action pops up the confirmation dialog. Click OK to restore the change from the index or Cancel to cancel the action.

Orion-status-page-checkout-confirm.png

Resetting all changes from the index

You can also reset all the unstaged and staged changes by clicking on the Reset from the page action.

Orion-status-page-reset-action.png

A confirmation dialog pops up when you click on the action. Click OK to reset the changes from the index or Cancel to cancel the action.

Orion-status-page-reset-confirm.png

Unstaging changes

From the top-right corner of the staged area, you can click on the unstage all action to unstage all the changes. Currently unstaging a single change is not supported yet but this will be addressed in the future version of Orion.

Orion-status-page-unstage-action.png

Committing changes

Once changes are staged, you can use actions in the commit area to commit the staged changes. The commit button is disabled if there is no message in the commit message, so you have to input the message before you commit the changes. The Amend check-box is used to amend the last commit.

Orion-status-page-commit-action.png

Back to the top