Skip to content

Commit a0af1a1

Browse files
committed
Added images and sections
- Encoding added to commit page and preferences - Bypass hooks added to 2 pages - Added workspaces .gif from All images taken from release notes images
1 parent d029977 commit a0af1a1

File tree

9 files changed

+20
-9
lines changed

9 files changed

+20
-9
lines changed

_images/Focus-View.png

-249 KB
Binary file not shown.

_images/bypass-git-hooks.png

365 KB
Loading
224 KB
Loading
374 KB
Loading

gitkraken-client/commits.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ The commit panel will then show the co-author in the history for that commit:
4747

4848
<img src='/wp-content/uploads/co-author-history.png' srcset='/wp-content/uploads/[email protected] 2x' class='img-bordered img-responsive center'>
4949

50-
### Skipping githooks
50+
### Bypass git hooks
5151

52-
You can select the option to skip hooks.
52+
There may be times when you want to skip your Git hooks when making a commit. This can be done on a commit-by-commit basis by selecting the `Commit and skip hooks` option.
53+
54+
<img src='/wp-content/uploads/bypass-git-hooks.png' class='img-responsive center img-bordered' />
5355

5456
***
5557

gitkraken-client/editing-files.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Clicking the <button class='button button--success button--ui button--nolink'>St
5656

5757
<img src='/wp-content/uploads/save-stage.png' srcset='/wp-content/uploads/[email protected] 2x' class='img-bordered img-responsive center'>
5858

59-
### Encoding
59+
## Encoding
6060

6161
All files have Encoding that defines how the binary should be read.
6262

@@ -67,3 +67,5 @@ You can also set your file encoding to `GUESS ENCODING` and GitKraken Client wil
6767
<div class='callout callout--warning'>
6868
<p>Note 📝 - GitKraken Client is NOT intended to be used to change a file(s) encoding and it not change the encoding when saving. We recommend using another editor, such as VSCode, to make file encoding changes.</p>
6969
</div>
70+
71+
<img src='/wp-content/uploads/preferences-encoding-select.png' class='img-bordered img-responsive center'>

gitkraken-client/githooks.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Hooks are stored in the `hooks` subdirectory of the `.git` directory. This folde
2424

2525
Hooks are unique to your local repository and will not be copied over if you create a new repository. Feel free to add, change, or remove scripts from this folder as necessary.
2626

27-
<img src='/wp-content/uploads//hook_location.png' srcset='/wp-content/uploads/[email protected] 2x' class='img-responsive center img-bordered' />
27+
<img src='/wp-content/uploads/hook_location.png' srcset='/wp-content/uploads/[email protected] 2x' class='img-responsive center img-bordered' />
2828

2929
If running OSX or Linux, GitKraken Client will seamlessly detect any Git hooks in your repository if your scripts are set to be executable. If you forgot to set your files to executables, GitKraken Client will throw an error as a heads up.
3030

@@ -149,7 +149,7 @@ Here are the hooks supported by GitKraken Client. Where appropriate, beneath eac
149149

150150

151151
***
152-
## Git Hooks Example
152+
## Git hooks example
153153

154154
Git hooks are scripts that perform automated actions when a specific action is performed in GitKraken Client or the command line. The git hook name usually indicates the hook’s trigger (e.g. pre-commit).
155155

@@ -215,7 +215,7 @@ If the condition is met we move on to the next condition. If the global user.sig
215215
```
216216
If the condition is successful the script will run and the commit will be made.
217217

218-
#### Full Script
218+
#### Full script
219219
```
220220
#!/bin/bash
221221
@@ -241,4 +241,10 @@ fi
241241
```
242242

243243
### Git hook in action
244-
<img src='/wp-content/uploads/hook-in-action.gif' class='img-responsive center img-bordered' />
244+
<img src='/wp-content/uploads/hook-in-action.gif' class='img-responsive center img-bordered' />
245+
246+
### Bypass git hooks
247+
248+
There may be times when you want to skip your Git hooks when making a commit. This can be done on a commit-by-commit basis by selecting the `Commit and skip hooks` option.
249+
250+
<img src='/wp-content/uploads/bypass-git-hooks.png' class='img-responsive center img-bordered' />

gitkraken-client/preferences.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ These settings only effect `Terminal` tabs.
201201

202202
Repo-Specific preferences only apply to the repo currently open in GitKraken Client. The following preferences are repo-specific:
203203

204+
- [Encoding](/editing-files/#encoding)
204205
- [Gitflow](/git-workflows-and-extensions/git-flow/)
205206
- [Git Hooks](/working-with-repositories/githooks/)
206207
- [Commit Template](/working-with-commits/commits/#commit-templates)

gitkraken-client/workspaces.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ If you are working with a GitHub.com Workspace, you may select a pull request to
7979

8080
### Focus view
8181

82-
The Focus View section will provide you with a summary of Pull Requests, Issues, and WIPs relevant to you for the repositories grouped in your Workspace.
82+
The Focus View section will provide you with a summary of Pull Requests, Issues, and WIPs relevant to you for the repositories grouped in your Workspace. The columns are sortable to make it esier to see what is going on across all of your Workspace repositories.
8383

84-
<img src="/wp-content/uploads/Focus-View.png" class="img-bordered img-responsive center">
84+
<img src="/wp-content/uploads/workspace-focus-view-sort-columns.gif" class="img-bordered img-responsive center">
8585

8686
* My Pull Requests: shows all PRs opened by you, assigned to you, or awaiting your review
8787
* My Issues: shows all issues created by you, assigned to you, or that mention you.

0 commit comments

Comments
 (0)