Git Client

Aqua Data Studio includes a built-in client for Git, an Open Source distributed version control system that runs on Windows, Mac OS, Linux and Solaris. A rich set of Git features are available through a powerful graphical interface, that provides quick and easy access to versioned files. File operations common to all version control systems such as check in, mark for add, edit, delete, rename, revert are supported. Other major Git features in Aqua Data Studio include initialize repository, checkout, clone, add a remote server, push, pull, branch, tag, cherry pick, compare, history, refresh and repository browsing.



Aqua Data Studio Git1 Client Provides:

Checkout a Git Project hosted in Google, Github, Gitorious, Heroku

To work with a Git project hosted remotely, you must bind Aqua Data Studio's Git client to the Git Repository. Within the File Browser, right click and select Checkout Project, enter the Repository URL, Username/Password and a local checkout directory. This will Pull(Update) the remote Git Project to your local directory.screenshots Git Checkout Project | Git Checkout Project Dialog

Working Concurrently

Aqua Data Studio's Git client helps teams to work concurrently. Multiple users can work on the same file at the same time. With the Merge feature you can merge changes between newly branches and master branch. Merge applies the difference between two sources to the working copy path.screenshots Git Merge

Tracking Change History

The Git client helps to track changes made in files between revisions. With the Version Control->Show History option, Revision number, author information, messages and date of change associated with the files can be viewed. The Changes column displays whether the files have been added, modified or deleted.screenshots Git View History

Comparing Files

You can use the Git client to compare any two file versions of the same file or files in the repository using the Compare with Base Revision option.screenshots Git Compare with Base Revision

Branching and Tagging

Branching is a method for managing changes between two or more sets of related files. With Aqua Data Studio's Git Client you can create a new branch in the repository separate from your main development source. Once the code in the newly created branch is stable, you can merge it back to the master branch at origin. Within the Files Browser, Version Control menus allow for branch/tag creation.screenshots Git Create Branch

Git Repository Browser

The repository browser points to the local version control repository root and offers an in-depth, explorable view of all the files in the repository. Launch the repository browser and view the contents as a tree. Right click within the repository browser and launch a menu with options to open and refresh. You can browse all the branches without switching.screenshots Git Repository Browser

Git Repository

Git stores your source code within a directory structure called a repository. A git repository contains commit objects and a set of references to commit objects, called heads. The Git repository is stored in the same directory as the project itself in a subdirectory called .git.screenshots Git Repository

Initialize a Git Repository with Aqua Data Studio

You can create a Git repository using Aqua Data Studio's Git Client. The Aqua Data Studio Tree Panel contains the File Browser. Within the File Browser, right click and select the option Create Git Repository. Aqua Data Studio uses the git init command to create an empty repository at the chosen folder. You can enable an option to Mount the repository once it is created.screenshots Create Git Repository

Inline Difference Indicators

Files in the repository can be opened, edited and saved in the different editors available in Aqua Data Studio. The inline difference sidebar of each editor automatically displays the differences between the currently edited file and its corresponding file in the repository as new text is being typed. Inline diff indicators appear in all source editors - SQL, HTML, XML, Text, JavaScript and Java. This option may be enabled in File->Editor->General->Inline Diff Sidebar.screenshots Git Inline Difference Indicators

Committing Changes

Once you have added, deleted or changed files or directories, you can use the Commit feature in Aqua Data Studio's Git Client to commit the changes from your working copy to the repository. You can Commit modifications to files with comments.screenshots Git Commit

Git Switch/Checkout Branch

Aqua Data Studio's Git client allows you to create a new branch and switch to the new branch context. Aqua Data Studio uses the git branch command in the client, to list your current branches, create new branches and delete unnecessary branches.screenshots Git Switch/Checkout

Git Push to Remote Repository

Once you have committed files to your local repository, you need to push your changes to the remote repository to share the files. To do this, Aqua Data Studio's Git client uses the git push [alias] [branch] command. Right click the repository, select Version Control->Push. Select the Source Branch and the Destination Repository and successfully push your branch to the remote project.screenshots Git Push

References

  1. ^ Git Wikipedia article. Git is a free distributed revision control system distributed under the terms of the GNU General Public License.

Home Aqua Data Studio Aqua Data Server AquaClusters Support Store Company Privacy

Copyright © 2001–2012 AquaFold, Inc. All Rights Reserved.