Page History
...
- Select the Files Tab. Context click on Filesystem
- Select Create Git Repository
- Browse to your local directory structure.
- Check Mount Git Repository Directory to have it automatically mounted in the Files browser. If you do not check this you must manually mount the directory.
- An empty GIT repository will be created in the chosen folder and it will appear in the Files browser with Version Control Status indicators
Right-click Create Git Repository | Select a directory |
...
- Select the Files Tab. Context click on Filesystem
- Select Mount Directory
- Choose the folder that has already been associated with a Git repository
Mount a Directory |
Step 2: Configure the Directory with GIT Version Control
- Right Click the Mounted Directory in Step 1
- Select Version Control > Git > Configure
- Click OK and Version Control indicators appear
Right-click Mounted Directory Configure | Repository Details Displayed | Version Control Green Indicators |
...
- Create new text or SQL files or copy the files you require to be in version control to the Git Repository created using Aqua Data Studio
- Multi-select the files, right-click and select Version Control > Add. If you see a '+' sign before the files, these are added to version control
- To Commit the files, right-click on the directory and select Commit.
Multiselect New Files Version Control Add | Multiselect and Commit | Version Control Commit Dialog | Version Control Commit Success |
...
- Select the Files Tab. Context click on Filesystem
- Select Version Control > Git > Clone Repository
- Enter General tab, select Git and enter the Repository URI - https://github.com/renatolouro/Simplate.git
- Select a destination folder in your local system. Browse and select the checkout directory
- Click OK and Aqua Data Studio displays the status of the received files.
Git Remote Checkout | Git Remote Checkout Success |
...
- Under Filesystem, select the cloned directory. Right-click and select Pull
- Once all the files are updated, the "up-to-date" message displays
Git Pull from Remote Repository |
...
- Under Filesystem, select the directory that you want changes to be updated. Right-click and select Version Control > Push
- Select Source Branch
- Select the Destination Repository from the drop-down.
- If you want to update another location, which is not configured with your local GIT repository, select Arbitrary Location and specify the URI. For e.g. https://github.com/yourproject/git_repo_name.git. Note that you need the authentication to Push to the location or you are a member of the project
- You can include options to Force overwrite existing branch, use thin pack, and include tags
Git Push to Remote Repository | Git Pushed to Remote Host |
...
- Under Filesystem, select your git repository. Right-click and select Version Control > Add Remote
- Enter a name
- Enter the URI
- Click Add
Git Add Remote Host |
Now next time you try to "Push" this remote server will be available under the Destination Repository in the dropdown. See step 2 in Push your changes to remote Git Repository in Github, google projects, heroku, gitorious, etc
...
- Under Filesystem, select your git repository. Right-click and select Branch...
- Now to create a branch, enter a new branch name
- Choose from the dropdown where it should start from
- Click OK
Git Create Branch |
A new branch is created and you are now switched to the new branch
...
- Under Filesystem, select your git repository. Right-click and select Version Control > Switch/Checkout
- The Branch Name field will be populated with your current branch
- Select the dropdown and the list of available branches will be displayed
- Choose the branch you want to change to
- Click OK
Git Switch Branch |
You are now switched to the selected branch.
...
- Under Filesystem, select your git repository. Right-click and select Version Control > Delete Branch
- The Branch Name field will be populated with your current branch
- Select the dropdown and the list of available branches will be displayed
- Choose the branch you want to delete
- Click OK
Git Delete Branch |
Merge changes from a selected commit to your current branch using Aqua Data Studio
...
- Under Filesystem, select your git repository. Right-click and select Version Control > Merge
- The list of available Branches and Tags displays
- Select the branch you want to merge. Master in this case.
- Click OK
Git Merge |
A merge result "Merged" will notify you of the operation
...
- Under Filesystem, select your git repository. Right-click and select Version Control > Tag
- If you are going to create a tag at the Head version, select the radio button Head, enter a message and click OK
- If you are going to create a tag for a particular revision, select the radio button revision, Click History and navigate to the commit
- Choose the commit that you want to Tag
- Click OK and now you have successfully tagged a revision
Git Tag |
See in the attached picture how I have tagged a commit to version v1.0.0
...
- In the Files Browser, select your git repository. Right-click and select Git Client
- In the upper left dropdown, navigate through the list of Tags and Branches
- Once you have found the branch that contains the commit, select the commit you want to cherry-pick. Right-click and select Cherry Pick This Commit
- Close the dialog and you can see that you have successfully cherry-picked and committed the new change to your branch
Git Cherrypick |
Rebase
It is possible to perform a Rebase operation by right-clicking on a mount associated with Git and selecting Version Control > Rebase...
Once you select the Rebase context menu, a dialog will appear allowing you to perform your Rebase with options for selecting specific
- Branch
- Tag
- Revision
Git Rebase Menu | Git Rebase Dialog |
...
- The upper left pane shows the series of commits to this repository, with the most recent on top
- There is a local branch, named "master", it points to the most recent commit
- If you scroll towards the bottom of the list, you can see that there are several commits so far
- You can view the comments for each commit under the header description
- Select a commit and right-click. Now select Show Changes and you can see the list of files impacted for this particular commit.
- The commit SHA (unique identifier, similar to subversion revision number) of the second commit is displayed
- The lower panel shows the commit details, including the full Diff with splines to show line differences.
Git History | Git History Show Changes |
...