diff options
| -rw-r--r-- | .bash/prompt.bash | 4 | ||||
| -rw-r--r-- | .gitconfig | 34 | ||||
| m--------- | tmux-gpakosz | 0 |
3 files changed, 21 insertions, 17 deletions
diff --git a/.bash/prompt.bash b/.bash/prompt.bash index 8abb1b4..9adc360 100644 --- a/.bash/prompt.bash +++ b/.bash/prompt.bash @@ -33,7 +33,7 @@ case "$MYUID" in fi ;; arch) FGC2="fgcolor 24";FGC3="fgcolor 240";; - redhat) FGC1="fgcolor 23";FGC2="fgcolor 88";FGC3="fgcolor 203";; + redhat|rhel) FGC1="fgcolor 23";FGC2="fgcolor 88";FGC3="fgcolor 203";; fedora) FGC1="fgcolor 160";FGC2="fgcolor 88";FGC3="fgcolor 203";; # with the advent of Rocky, we'll match the time to SUSE's blue and the hostname to # the colour of Geeko: @@ -88,7 +88,7 @@ case "$MYUID" in fi ;; arch) FGC1="fgcolor 24";FGC3="fgcolor 239";; - redhat) FGC1="fgcolor 23";FGC3="fgcolor 88";; + redhat|rhel) FGC1="fgcolor 23";FGC3="fgcolor 88";; fedora) FGC1="fgcolor 88";FGC3="fgcolor 203";; #*suse|aix) FGC1="fgcolor 22";FGC3="fgcolor 41";; *sles*) FGC1="fgcolor 22";FGC3="fgcolor 83";; @@ -1,3 +1,4 @@ +# vim:syntax=gitconfig:ts=4 [color] diff = auto status = auto @@ -65,41 +66,44 @@ rhh = reset --hard HEAD sl = shortlog -s sls = "!git shortlog -s | cut -f1 | spark" - gl-mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -" + gl-mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -" cps = cherry-pick -S force = push --force-with-lease pf = push --force-with-lease [push] - default = simple + default = simple [pretty] - ln-long = format:%C(auto)%H %gD %d %nAuthor: %aN <%aE>%n%C(auto)GPG signature: %G? %GF (%GT)%nGPG Primary Key: %GP%nDate: %ad %nSubject: %s %+b %+N %+(trailers) + ln-long = format:%C(auto)%H %gD %d %nAuthor: %aN <%aE>%n%C(auto)GPG signature: %G? %GF (%GT)%nGPG Primary Key: %GP%nDate: %ad %nSubject: %s %+b %+N %+(trailers) [core] - editor = vim - fileMode = true - hooksPath = ~/git-hooks + editor = vim + fileMode = true + hooksPath = ~/git-hooks + abbrev = 4 [merge] - tool = vimdiff + tool = vimdiff [mergetool] - keepBackup = false + keepBackup = false [gui] - fontui = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 - fontdiff = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 + fontui = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 + fontdiff = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 [commit] - gpgsign = false + gpgsign = false +[tag] + gpgsign = false #[gpg] # program = /usr/bin/gpg2 [http] #proxy = http://10.0.0.1:3128/ [pull] - rebase = false + rebase = false [pack] windowMemory = 1024m [credential] - helper = !type pass-git-helper > /dev/null && pass-git-helper $@ - useHttpPath = true + helper = !type pass-git-helper > /dev/null && pass-git-helper $@ + useHttpPath = true [init] # we don't adhere to extremists trying to alter language, this was a bad idea pre-1990 and it still is. # this term was not meant racially or sexually abusive, so the convention remains. defaultBranch = master [safe] - directory = /opt/puppetlabs/pdk/share/cache/pdk-templates.git + directory = /opt/puppetlabs/pdk/share/cache/pdk-templates.git diff --git a/tmux-gpakosz b/tmux-gpakosz -Subproject 9cf49731cd785b76cf792046feed0e827545791 +Subproject e25f45ed3df5a83339fcfd99d256b0d1958d646 |