Skip to content

Commit e3bdeef

Browse files
authored
Merge pull request #160 from jkelroy/9.7-updates
9.7 updates
2 parents 560c8f4 + 343b092 commit e3bdeef

File tree

4 files changed

+18
-43
lines changed

4 files changed

+18
-43
lines changed

_images/gkc-wip-diff.png

325 KB
Loading

gitkraken-client/date-format.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

gitkraken-client/diff.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,15 @@ This will produced a combined diff, which lists all files that were added, modif
127127
</div>
128128

129129
***
130+
131+
## Diff a WIP
132+
133+
When you have a Work in Progress (WIP), you can diff this against any commit or branch by ctrl/command clicking the WIP and then the other desired commit. Alternativley, with your WIP sleected, you can right-click the desired commit or branch and select `compare commit against working directory`.
134+
135+
<img src='/wp-content/uploads/gkc-wip-diff.png' class='img-bordered img-responsive center'>
136+
137+
***
138+
130139
## File Blame and History
131140

132141
_File History_ and _File Blame_ information display in the same view.

gitkraken-client/preferences.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ The following UI preferences are available:
158158

159159
- [Theme](/start-here/themes)
160160
- Notification location
161+
- Date/Time Locale
162+
- Date/Time Short Format
161163
- Show toolbar icon labels
162164
- Enable spell checking
163165
- Display author initials instead of avatars (Gravatar)
@@ -170,6 +172,12 @@ The following UI preferences are available:
170172
- Show commit date/time in graph
171173
- Show commit sha in graph
172174

175+
### Date/Time Locale and Short Format
176+
177+
Date and Time Locale can be set from the UI Customization to match your system or you can set a custom locale. The Date/Time Short Format will match the Date/Time Locale. However, you can define a custom format as well.
178+
179+
See all formatting options that can be used <a href="https://momentjs.com/docs/#/displaying/format/">here</a>.
180+
173181
## GPG Preferences
174182

175183
Learn more about how to [configure GPG signing](/git-workflows-and-extensions/commit-signing-with-gpg/#configure-gpg-in-gitkraken) in GitKraken Client.
@@ -203,6 +211,7 @@ Activate [Experimental Features](/gitkraken-client/experimental-features.md) and
203211

204212
- Git Binary: Use Git executable instead of NodeGit Git actions (partially, not all git actions are implemented to Git executable)
205213
- AI Commit Message Generation
214+
206215
## Repo-Specific Preferences
207216

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

0 commit comments

Comments
 (0)