mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-24 10:02:26 +03:00
Merge branch 'master' into ian/gb-194-remove-purple-for-bars-for-blue-and
This commit is contained in:
commit
9bdf0493ff
@ -173,6 +173,7 @@ impl Repository {
|
||||
let mut opts = DiffOptions::new();
|
||||
opts.recurse_untracked_dirs(true)
|
||||
.include_untracked(true)
|
||||
.show_untracked_content(true)
|
||||
.include_ignored(true);
|
||||
|
||||
let diff = repo.diff_tree_to_workdir(Some(&tree), Some(&mut opts))?;
|
||||
|
@ -105,7 +105,7 @@
|
||||
<div
|
||||
class="right-1 top-1 inline-flex items-center rounded border border-zinc-700/20 bg-zinc-700/50 px-1 py-[2px] font-mono text-zinc-200 shadow sm:text-sm"
|
||||
>
|
||||
⌘K
|
||||
⌘ K
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user