gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-25 02:26:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ian/gb-194-remove-purple-for-bars-for-blue-and

Browse Source
This commit is contained in:
Ian Donahue 2023-04-11 16:48:05 +02:00 committed by GitHub
commit 9bdf0493ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src-tauri/src/repositories/repository.rs
View File

@ -173,6 +173,7 @@ impl Repository {
let mut opts = DiffOptions::new(); let mut opts = DiffOptions::new();
opts.recurse_untracked_dirs(true) opts.recurse_untracked_dirs(true)
.include_untracked(true) .include_untracked(true)
.show_untracked_content(true)
.include_ignored(true); .include_ignored(true);
let diff = repo.diff_tree_to_workdir(Some(&tree), Some(&mut opts))?; let diff = repo.diff_tree_to_workdir(Some(&tree), Some(&mut opts))?;

2
src/routes/projects/[projectId]/+layout.svelte
View File

@ -105,7 +105,7 @@
<div <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" 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"
> >
&#8984;K &#8984;&nbsp;K
</div> </div>
</div> </div>