You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Select the files you wish to stage, and click on any files you wish to review in the diff. To stage all your files, use the keyboard shortcut <kbd>⌘</kbd><kbd>Shift</kbd><kbd>S</kbd> for Mac or <kbd>Ctrl</kbd><kbd>Shift</kbd><kbd>S</kbd> for Windows or Linux.
26
+
Click any files to review the diff, or select specific files to stage changes.
27
27
28
-
When you’re ready, type your message and hit commit to commit your changes. You can also use this **Commit** keyboard shortcut <kbd>⌘</kbd> + <kbd>Enter</kbd> for Mac or <kbd>Ctrl</kbd> + <kbd>Enter</kbd> if you are on Linux or Windows.
28
+
When you’re ready, type your message and hit commit to commit your changes. You can also use this **Commit** keyboard shortcut <kbd>Ctrl</kbd> + <kbd>Enter</kbd> if you are on Linux or Windows or <kbd>⌘</kbd> + <kbd>Enter</kbd> for Mac.
29
29
30
30
<aid="commit-and-push"></a>
31
31
### Commit and push
@@ -163,6 +163,6 @@ If you're a keyboard fan, you may also enjoy using the keyboard shortcut
If you wish to revert a commit (perhaps Undo is not available), the option is available when right-clicking on a commit node. This will create a new commit to reverse your previous changes.
166
+
If you wish to revert a commit, this will create a new commit to reverse your previous changes. The option is available when right-clicking on a commit node.
Copy file name to clipboardExpand all lines: gitkraken-client/diff.md
+8-8Lines changed: 8 additions & 8 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -19,9 +19,9 @@ Compare changes within GitKraken Desktop _diffs_. Learn where to access _diffs_,
19
19
20
20
## What is a diff in GitKraken Desktop?
21
21
22
-
A diff shows what was added or removed from a file. <spanstyle='color: #d90171;'>Red</span> is for lines where content was removed whereas <spanstyle='color: #7bd938;'>green</span> is for new lines added.
22
+
A diff shows additions and removals from a file. <spanstyle='color: #d90171;'>Red</span> is for lines where content was removed whereas <spanstyle='color: #7bd938;'>green</span> is for new lines added.
GitKraken Desktop's diff comes included with the following:
27
27
@@ -160,17 +160,17 @@ Use the top toggle button to switch between <kbd>Diff View</kbd>, which shows th
160
160
161
161
A patch, or patchfile, is a file describing changes between 2 files. Patch files can be used to distribute changes that a given user would like to make to a particular revision without codifying it onto a git server. Patches can be created from either a commit(s) or a file(s).
162
162
163
-
To create a patch from a commit, right-click a commit and select `Create patch from commit`. You will be prompted to name the patch after.
163
+
To create a patch from a file, right-click on a file and select `Create patch from file changes`. You will be prompted to name the patch after.
You can also multi-select files or commits by holding command/ctrl or shift and clicking. You can then right-click the selected files or commits to create a patch from the selected.
171
+
You can also multi-select files or commits by holding ctrl/command or shift and clicking. You can then right-click the selected files or commits to create a patch from the selected.
To apply a patch, use the keyboard shortcut `command/ctrl + Shift + P` or click the <iclass="fa fa-magic"style="transform: rotate(225deg)"></i> in the top right of the UI to bring up the Command Palette. Type “Apply Patch" to summon the “Apply Patch” command, and select it to open your file explorer.
Copy file name to clipboardExpand all lines: gitkraken-client/faq.md
+5-5Lines changed: 5 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -27,15 +27,15 @@ The answers to your important **F**requently **A**sked **Q**uestions.
27
27
28
28
***
29
29
30
-
### Does GitKraken Desktop support TFS, Visual Studio Team Service or Azure DevOps?
30
+
### Does GitKraken Desktop support Visual Studio Team Service, TFS, or Azure DevOps?
31
31
Yes, for Azure DevOps (previously VSTS), you can use our integration with [Azure DevOps](/integrations/azure-devops/)!
32
32
33
33
For TFS instances you will need to clone your repo <kbd><strong>File > Clone Repo</strong></kbd> and then enter the HTTPS repository URL (which can be found at the top-right of your Code page).<br><br>
34
-
If you're connecting to a remote TFS Git server from a Mac or Linux, you will need to enable _Basic Authentication_ in IIS for TFS.
34
+
Enable _Basic Authentication_ in IIS for TFS if you're connecting to a remote TFS Git server from a Mac or Linux.
35
35
36
36
If authenticating to TFS via username and password is not working, try creating a Personal Access Token (PAT) to use in place of a password.
37
37
38
-
For more information authenticating with repos, check out our [SSH and HTTPS](/integrations/authentication) page.
38
+
Check out our [SSH and HTTPS](/integrations/authentication) page for more information.
39
39
40
40
***
41
41
@@ -173,13 +173,13 @@ You can also set your file encoding to `GUESS ENCODING` and GitKraken Desktop wi
173
173
174
174
### How to get SILLY (extended) logs
175
175
176
-
To obtain extended SILLY (extended) logs:
176
+
Obtain extended SILLY (extended) logs by doing the following:
177
177
178
178
* Close GitKraken
179
179
* (optional) Rename or move the \logs folder under ~\.gitkraken\logs. The data location for this folder on your OS can be found [here](/gitkraken-client/how-to-install/)
180
180
* Start GitKraken from the CLI using the command `gitkraken -d SILLY`
<p>To hide a branch, mouse over that branch, and you will see the eye <i class='fa fa-eye icon-green'></i> icon appear to the left of the branch name; click this to hide. Or perform this task by right-clicking the branch and selecting `Hide`.</p>
24
30
<p>Hidden branches will now have a gray eye <i class='fa fa-eye-slash'></i> icon. Clicking this will restore that repo to the graph.</p>
<p>Soloing a branch will hide all other branches which have not been soloed, showing <i>only</i> soloed branches.</p>
35
-
<p>To solo a branch, right-click the branch and select `Solo`. This initiates Solo Mode, with soloed branches highlighted in orange and with a solid orange <i class='fa fa-dot-circle-o icon-orange'></i> icon to the left of the branch name.</p>
34
+
<p>To solo a branch, right-click the branch and select `Solo`. This initiates Solo Mode, with soloed branches highlighted in orange and with a solid orange <i><p>Soloing a branch will hide all other branches which have not been soloed, showing <i>only</i> soloed branches.</p>
35
+
class='fa fa-dot-circle-o icon-orange'></i> icon to the left of the branch name.</p>
36
36
<p>Solo/unsolo additional branches by clicking on the semi-opaque icon to the left of that branch's name.</p>
37
37
<p>Consider hiding/soloing entire remotes if you only need about two remotes, and then hiding everything else.</p>
0 commit comments