diff --git a/.gitconfig b/.config/git/config similarity index 98% rename from .gitconfig rename to .config/git/config index 044d2c7..7faf909 100644 --- a/.gitconfig +++ b/.config/git/config @@ -38,14 +38,17 @@ editor = vim pager = delta whitespace = -trailing-space,-space-before-tab +[status] + submoduleSummary = true [diff] tool = vimdiff colorMoved = default + submodule = log [merge] tool = vimdiff conflictstyle = diff3 [log] - date=iso + date = iso [interactive] diffFilter = delta --color-only [delta] # [dandavison/delta: A syntax-highlighting pager for git, diff, and grep output](https://github.com/dandavison/delta) diff --git a/.config/git/gitk b/.config/git/gitk new file mode 100644 index 0000000..7a13cf5 --- /dev/null +++ b/.config/git/gitk @@ -0,0 +1,64 @@ +set mainfont {{Ubuntu Mono} 11} +set textfont {{Ubuntu Mono} 11} +set uifont {{Ubuntu Mono} 11 bold} +set tabstop 8 +set findmergefiles 0 +set maxgraphpct 50 +set maxwidth 16 +set cmitmode patch +set wrapcomment none +set autoselect 1 +set autosellen 40 +set showneartags 1 +set maxrefs 20 +set visiblerefs {"master"} +set hideremotes 0 +set showlocalchanges 1 +set datetimeformat {%Y-%m-%d %H:%M:%S} +set limitdiffs 1 +set uicolor #302c2c +set want_ttk 1 +set bgcolor #2e3031 +set fgcolor #d9dedc +set uifgcolor black +set uifgdisabledcolor #999 +set colors {"#00ff00" red blue magenta darkgrey brown orange} +set diffcolors {{#ffffff} #ffffff #3376f0} +set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} +set markbgcolor #8b8b8e +set diffcontext 3 +set selectbgcolor #000000 +set foundbgcolor yellow +set currentsearchhitbgcolor orange +set extdifftool meld +set perfile_attrs 0 +set headbgcolor #00ff00 +set headfgcolor black +set headoutlinecolor black +set remotebgcolor #ffddaa +set tagbgcolor yellow +set tagfgcolor black +set tagoutlinecolor black +set reflinecolor black +set filesepbgcolor #aaaaaa +set filesepfgcolor black +set linehoverbgcolor #ffff80 +set linehoverfgcolor black +set linehoveroutlinecolor black +set mainheadcirclecolor yellow +set workingfilescirclecolor red +set indexcirclecolor #00ff00 +set circlecolors {white blue gray blue blue} +set linkfgcolor blue +set circleoutlinecolor black +set diffbgcolors {{#600000} #004800} +set web_browser xdg-open +set geometry(main) 1920x1023+0+26 +set geometry(state) normal +set geometry(topwidth) 1920 +set geometry(topheight) 255 +set geometry(pwsash0) "672 1" +set geometry(pwsash1) "1008 1" +set geometry(botwidth) 836 +set geometry(botheight) 763 +set permviews {} diff --git a/README.md b/README.md index 41730da..9b3ddbd 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ see for example [How to Store Dotfiles - A Bare Git Repository \| Atlassian Git - [Vifm](./.config/vifm/README.md) - [SSH](./.ssh/README.md) - [Newsboat](./.newsboat/README.md) -- Git: [.gitconfig](./.gitconfig), [gh](./.config/gh/config.yml) +- [git](./.config/git/config), [gh](./.config/gh/config.yml) - [KDE Neon](#kde-neon) - [Mozilla Firefox](./.mozilla/firefox/README.md) - [Bin – scripts and executables](./bin/README.md)