Skip to content

Commit d029977

Browse files
committed
First pass of Doc updates
1 parent cdca0f8 commit d029977

File tree

3 files changed

+22
-4
lines changed

3 files changed

+22
-4
lines changed

gitkraken-client/commits.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ 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
51+
52+
You can select the option to skip hooks.
53+
5054
***
5155

5256
<a id="commit-templates"></a>

gitkraken-client/editing-files.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,16 @@ To exit the file without saving your changes, hover over the blue dot, click the
5454

5555
Clicking the <button class='button button--success button--ui button--nolink'>Stage File</span></button> button with pending changes will give you the options to `Save and stage` or `Stage saved changes only`.
5656

57-
<img src='/wp-content/uploads/save-stage.png' srcset='/wp-content/uploads/[email protected] 2x' class='img-bordered img-responsive center'>
57+
<img src='/wp-content/uploads/save-stage.png' srcset='/wp-content/uploads/[email protected] 2x' class='img-bordered img-responsive center'>
58+
59+
### Encoding
60+
61+
All files have Encoding that defines how the binary should be read.
62+
63+
GitKraken Client expects most files to use `UTF-8` file encoding. If you are using another encoding type, you can set your type at the top when editing your file, or from the preferences menu.
64+
65+
You can also set your file encoding to `GUESS ENCODING` and GitKraken Client will try to match the file encoding so that it is displayed correctly. Take care to select the correct file encoding when editing the file, as selecting the incorrect encoding could lead to unexpected errors.
66+
67+
<div class='callout callout--warning'>
68+
<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>
69+
</div>

gitkraken-client/faq.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,12 @@ Try running [git gc](https://git-scm.com/docs/git-gc) from the terminal on this
153153

154154
***
155155

156-
### My files are not showing up as expected or are marked as binary.
157-
GitKraken Client only supports `UTF-8` file encoding. Files may display in an unexpected way or be marked a binary if files are not encoded in UTF-8.
156+
### My files are not showing up as expected or have strange characters.
157+
GitKraken Client expects most files to use `UTF-8` file encoding. If you are using another encoding type, you can set your type at the top when editing your file, or per-repository from the preferences menu.
158+
159+
You can also set your file encoding to `GUESS ENCODING` and GitKraken Client will try to match the file encoding so that it is displayed correctly. Take care to select the correct file encoding when editing the file, as selecting the incorrect encoding could lead to unexpected errors.
160+
158161

159-
You can use and [external diff and merge tools](/working-with-repositories/branching-and-merging/#external-merge-tools) to work on files using other encoding types.
160162

161163
***
162164

0 commit comments

Comments
 (0)