Compare commits

..

No commits in common. "5d1ba25cd7540593791b685c76616416a44ebf94" and "72eb048b7325d8b20990c2c566c0495ac7880a7c" have entirely different histories.

2 changed files with 37 additions and 91 deletions

View file

@ -1,35 +1,27 @@
[alias] [user]
trash = !git ls-files --others --directory --exclude-standard | xargs trash-put -v name = Tobias Schmidl
[branch] [branch]
autosetuprebase = always autosetuprebase = always
[branch "master"] [branch "master"]
rebase = true rebase = true
[core] [core]
autocrlf = input autocrlf = input
excludesfile = ~/.config/gitignore
pager = less -F -X
whitespace = tabwidth=4 whitespace = tabwidth=4
pager = less -F -X
excludesfile = ~/.config/gitignore
[credential] [credential]
helper = store helper = store
[diff] [diff]
algorithm = histogram
renamelimit = 65536 renamelimit = 65536
renames = copies renames = copies
[difftool] [difftool]
prompt = false prompt = false
[fetch]
fsckobjects = true
[filter "lfs"]
clean = git-lfs clean -- %f
process = git-lfs filter-process
required = true
smudge = git-lfs smudge -- %f
[gitflow "prefix"] [gitflow "prefix"]
feature = feature/system/ feature = dev/
versiontag = v versiontag = v
[http] [http]
sslverify = true sslverify = true
sslversion = tlsv1.3 sslversion = tlsv1.2
[merge] [merge]
conflictstyle = diff3 conflictstyle = diff3
renormalize = true renormalize = true
@ -37,28 +29,35 @@
[pack] [pack]
threads = 0 threads = 0
[pager] [pager]
diff = diffr | less -FRX
log = diffr | less -FRX log = diffr | less -FRX
show = diffr | less -FRX show = diffr | less -FRX
diff = diffr | less -FRX
[pull] [pull]
rebase = true rebase = true
[rebase] [transfer]
autosquash = true fsckobjects = true
[fetch]
fsckobjects = true
[receive] [receive]
fsckobjects = true fsckobjects = true
[sendemail] [rebase]
transferEncoding = 8bit autosquash = true
[svn]
addAuthorFrom = true
findcopiesharder = true
rmdir = true
useLogAuthor = true
[tig] [tig]
blob-view = line-number:yes,interval=5 text blob-view = line-number:yes,interval=5 text
diff-highlight = true diff-highlight = true
line-graphics = utf-8 line-graphics = utf-8
tab-size = 4 tab-size = 4
[transfer] [filter "lfs"]
fsckobjects = true required = true
[user] clean = git-lfs clean -- %f
name = Tobias Schmidl smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[svn]
findcopiesharder = true
rmdir = true
useLogAuthor = true
addAuthorFrom = true
[alias]
trash = !git ls-files --others --directory --exclude-standard | xargs trash-put -v
[sendemail]
transferEncoding = 8bit

View file

@ -1,79 +1,26 @@
# Beware! This file is rewritten by htop when settings are changed in the interface. # Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly. # The parser is also very primitive, and not human-friendly.
htop_version=3.2.2 fields=0 48 17 18 2 46 49 38 39 40 47 102 103 106 107 111 1
config_reader_min_version=3 sort_key=46
fields=0 48 17 18 38 39 40 2 46 47 49 1 sort_direction=1
hide_threads=0
hide_kernel_threads=0 hide_kernel_threads=0
hide_userland_threads=0 hide_userland_threads=0
hide_running_in_container=0
shadow_other_users=0 shadow_other_users=0
show_thread_names=1 show_thread_names=1
show_program_path=1 show_program_path=1
highlight_base_name=1 highlight_base_name=1
highlight_deleted_exe=1
shadow_distribution_path_prefix=0
highlight_megabytes=1 highlight_megabytes=1
highlight_threads=1 highlight_threads=1
highlight_changes=0 tree_view=1
highlight_changes_delay_secs=5
find_comm_in_cmdline=1
strip_exe_from_cmdline=1
show_merged_command=0
header_margin=0 header_margin=0
screen_tabs=0
detailed_cpu_time=1 detailed_cpu_time=1
cpu_count_from_one=0 cpu_count_from_zero=1
show_cpu_usage=1
show_cpu_frequency=0
show_cpu_temperature=0
degree_fahrenheit=0
update_process_names=0 update_process_names=0
account_guest_in_cpu_meter=1 account_guest_in_cpu_meter=1
color_scheme=6 color_scheme=6
enable_mouse=1
delay=15 delay=15
hide_function_bar=0 left_meters=LeftCPUs2 Load Memory Swap
header_layout=two_50_50 left_meter_modes=1 1 1 1
column_meters_0=LeftCPUs4 Memory Swap right_meters=RightCPUs2 Tasks LoadAverage Uptime
column_meter_modes_0=1 1 1 right_meter_modes=1 2 2 2
column_meters_1=RightCPUs4 Tasks LoadAverage Uptime
column_meter_modes_1=1 2 2 2
tree_view=1
sort_key=46
tree_sort_key=0
sort_direction=-1
tree_sort_direction=1
tree_view_always_by_pid=1
all_branches_collapsed=1
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
.sort_key=PERCENT_CPU
.tree_sort_key=PID
.tree_view=1
.tree_view_always_by_pid=1
.sort_direction=-1
.tree_sort_direction=1
.all_branches_collapsed=1
screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
.sort_key=IO_RATE
.tree_sort_key=PID
.tree_view=0
.tree_view_always_by_pid=0
.sort_direction=-1
.tree_sort_direction=1
.all_branches_collapsed=0
screen:Main=PID USER PRIORITY NICE STATE PERCENT_CPU TIME M_VIRT M_RESIDENT M_SHARE PERCENT_MEM RCHAR WCHAR RBYTES WBYTES IO_RATE Command
.sort_key=PERCENT_CPU
.tree_sort_key=PERCENT_CPU
.tree_view=0
.tree_view_always_by_pid=0
.sort_direction=-1
.tree_sort_direction=-1
.all_branches_collapsed=0
screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
.sort_key=IO_RATE
.tree_sort_key=PID
.tree_view=0
.tree_view_always_by_pid=0
.sort_direction=-1
.tree_sort_direction=1
.all_branches_collapsed=0