Skip to content

Commit 3b7f478

Browse files
authored
Merge pull request #130 from neel1996/document-v2.0.1
Updated documentation v2.0.1
2 parents e2b93b0 + e1201b5 commit 3b7f478

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

DOCUMENTATION.md

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Introduction
22
GitConvex is a web app for managing your git repositories. It is supported by Linux, Mac OS and Windows. The [latest version](https://github.com/neel1996/gitconvex/releases) of GitConvex supports git features such as initializing and tracking a git repo, staging and unstaging changes, committing changes, pushing changes to the selected remote and so on.
3-
The main goal of this platform is to act as a web-based alternative for Github desktop, but we are still in the starting stages, so we are not completely there yet (baby steps, right?)
3+
The main goal of this platform is to act as a web-based alternative for native git GUI clients and also to provide an option for managing git repos which are residing in servers with no GUI. Gitconvex is also available as a docker image along with the yaml files included in the repo for deploying it with k8s or docker swarm, which makes it a viable option for managing git repos residing within containers.
44
## Table of Contents
55
[Requirements](#requirements)<br>
66
[Download Options](#download-options)<br>
77
[Features available](#features-available)<br>
88
[How to use](#how-to-use)
99
- [Adding a new repo](#adding-a-new-repo)
1010
- [Repo Details](#repo-details)
11-
- [Add a new branch](#add-new-branch)
11+
- [List all branches](#list-all-branches)
1212

1313
## Requirements
1414
1. [Git](https://git-scm.com/) (Version 2.20+)
@@ -92,17 +92,17 @@ The repo detail view also provides features for performing the following operati
9292
- Code view for valid files from the file explorer view
9393
- Loading commit logs dynamically
9494
```
95-
96-
![repo-card-details](https://user-images.githubusercontent.com/65342122/89164057-30deb800-d594-11ea-94d6-d3a330260044.png)
95+
![repo-card-details](https://user-images.githubusercontent.com/65342122/103479129-82b09600-4df1-11eb-808f-9a6eba736841.png)
9796

9897
### Commit logs
9998

10099
- With commit log searchbar, any commit log can be looked up using its commit message or commit hash or author name who created that commit.
101100

102101
![commit-logs](https://user-images.githubusercontent.com/65342122/90782955-1723cb80-e31d-11ea-9c42-d1d5a6306e6f.png)
103102

104-
#### Add new branch
105-
![new-branch](https://user-images.githubusercontent.com/65342122/87232643-23437180-c3de-11ea-9d9e-7e3c3789c32e.png)
103+
#### List all branches
104+
105+
![branches](https://user-images.githubusercontent.com/65342122/103480861-f7d59880-4dfc-11eb-9a19-17636d111388.png)
106106

107107
Note: In a newly initialized git repo, the newly added branch will be considered by git only after an initial commit
108108

@@ -111,30 +111,27 @@ Note: In a newly initialized git repo, the newly added branch will be considered
111111

112112
### File View
113113
- File view shows the New/Untracked/Modified/Deleted files.
114-
![file-view](https://user-images.githubusercontent.com/65342122/87232644-29d1e900-c3de-11ea-9adc-03fb4e690882.png)
114+
![file-view](https://user-images.githubusercontent.com/65342122/103479243-577a7680-4df2-11eb-97f0-35c318d1c0c0.png)
115115

116116
### Git Operations
117117
- Git operations module lets you handle three basic git operations (**Stage all changes, commit changes, push to remote**). Below this option, the files will be displayed and the files can be staged individually using the "Add" button or as a whole using the "stage all changes".
118-
![git-operations](https://user-images.githubusercontent.com/65342122/87232645-30f8f700-c3de-11ea-8ddb-52f4d5ec7140.png)
118+
![git-operations](https://user-images.githubusercontent.com/65342122/103480923-7f230c00-4dfd-11eb-95c7-abf0aadd0aec.png)
119119

120120
- The staged files can be removed individually or it can be removed all at once.
121-
![staged-files](https://user-images.githubusercontent.com/65342122/89167388-ff1c2000-d598-11ea-8150-fc96b6aa41b7.png)
121+
![staged-files](https://user-images.githubusercontent.com/65342122/103479263-82fd6100-4df2-11eb-93e2-e731479ef4f1.png)
122122

123123
- The staged changes can be committed using the **Commit changes** option. This will display a pop-up with all the staged files and it requires a commit message to successfully commit the changes. The commit messages can either be a single line message or a multi-line message
124-
![commit-changes](https://user-images.githubusercontent.com/65342122/87232659-56860080-c3de-11ea-9bc4-a19ad727b101.png)
125-
126-
- **Push to remote** option pushes all commits to the selected remote host. The pop-up displayed will display the commits which are in queue to be pushed to the remote repository
124+
![commit-changes](https://user-images.githubusercontent.com/65342122/103479271-95779a80-4df2-11eb-91c8-835742758ad4.png)
127125

128-
![push-operation-with-remote](https://user-images.githubusercontent.com/65342122/89562600-d796b300-d837-11ea-969c-9abb93f24c1c.png)
126+
- **Push to remote** option pushes all commits to the selected remote host. The pop-up displayed will display the commits which are in queue to be pushed to the remote repository.
129127

130-
This section will let you know if the selected remote is not valid or if the push operation fails
131-
![push-opeartion-without-remote](https://user-images.githubusercontent.com/65342122/89562476-a1f1ca00-d837-11ea-9f3a-bb566aeb327e.png)
128+
![push-operation-with-remote](https://user-images.githubusercontent.com/65342122/103480641-66b1f200-4dfb-11eb-9753-e736bdb49b43.png)
132129

133130
### Git Difference
134131

135132
In "Git Difference" click on the modified file to see the difference. The platform has syntax highlighting available for a limited set of [languages](LANGUAGES.md)
136133

137-
![git-difference](https://user-images.githubusercontent.com/65342122/89559704-ab793300-d833-11ea-88a8-28afea4b461b.png)
134+
![git-difference](https://user-images.githubusercontent.com/65342122/103480618-497d2380-4dfb-11eb-99d5-08543457c445.png)
138135

139136
## Compare
140137
- The **Compare** menu has two sections: **Branch compare** and **Commit compare**.
@@ -149,10 +146,11 @@ In "Git Difference" click on the modified file to see the difference. The platfo
149146

150147
## Settings
151148
- Settings in the left pane has three sections (Server data file, saved repos, Active GitConvex port number).
152-
![settings](https://user-images.githubusercontent.com/65342122/87243003-a4871c80-c44f-11ea-9d1a-8350bdfb0da8.png)
149+
![settings](https://user-images.githubusercontent.com/65342122/103557499-53755400-4ed9-11eb-9c37-7ffb7891fc2e.png)
153150

154151
- Server data file stores repo details such as the repo path, timestamp and the unique ID assigned to each repo. The data file must be an accessible JSON file with read / write permissions set to it. Also make sure you enter the full path for the file. E.g: /opt/my_data/data-file.json
155152
- In the saved repos section, added repo(s) can be deleted permanently from GitConvex.
153+
- Saved repo name can be changed in this section.
156154

157155
>Note that, this will only remove the repo from GitConvex records and it will not perform an actual folder delete operation
158156
@@ -161,4 +159,5 @@ In "Git Difference" click on the modified file to see the difference. The platfo
161159
## Help and Support
162160

163161
- Visit help section if you're facing an issue or need any help. If you have any queries or feedback, then discuss it in "Discord" or report an issue in GitHub.
164-
![help-and-support](https://user-images.githubusercontent.com/65342122/101987492-5efaa400-3cba-11eb-87fb-6d8cb19ae9d2.png)
162+
- You can check the current version of Gitconvex by clicking on the update button in this section.
163+
![help-and-support](https://user-images.githubusercontent.com/65342122/103891656-3eced100-5110-11eb-9497-3daf8d4195d2.png)

0 commit comments

Comments
 (0)