added git configuration and a small fix to tmux
This commit is contained in:
parent
7cca1482c5
commit
ace4219a0d
2
.gitignore
vendored
2
.gitignore
vendored
@ -8,6 +8,8 @@
|
|||||||
!scripts/*
|
!scripts/*
|
||||||
!nano/*
|
!nano/*
|
||||||
!x11/**
|
!x11/**
|
||||||
|
!git/*
|
||||||
!starship.toml
|
!starship.toml
|
||||||
|
|
||||||
#directory catchall
|
#directory catchall
|
||||||
!*/
|
!*/
|
22
git/config
Executable file
22
git/config
Executable file
@ -0,0 +1,22 @@
|
|||||||
|
|
||||||
|
[hub]
|
||||||
|
protocol = https
|
||||||
|
[core]
|
||||||
|
editor = code --wait
|
||||||
|
[user]
|
||||||
|
name = Colin Henry
|
||||||
|
email = jchenry@users.noreply.github.com
|
||||||
|
[push]
|
||||||
|
default = simple
|
||||||
|
[diff]
|
||||||
|
tool = vscode
|
||||||
|
[difftool "vscode"]
|
||||||
|
cmd = code --wait --diff $LOCAL $REMOTE
|
||||||
|
[merge]
|
||||||
|
tool = vscode
|
||||||
|
[mergetool "vscode"]
|
||||||
|
cmd = code --wait $MERGED
|
||||||
|
[alias]
|
||||||
|
lgb = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%n' --abbrev-commit --date=relative --branches
|
||||||
|
[http]
|
||||||
|
sslverify = true
|
86
git/gitignore_global
Executable file
86
git/gitignore_global
Executable file
@ -0,0 +1,86 @@
|
|||||||
|
# temp files
|
||||||
|
~*
|
||||||
|
# Compiled source #
|
||||||
|
###################
|
||||||
|
*.com
|
||||||
|
*.class
|
||||||
|
*.dll
|
||||||
|
*.exe
|
||||||
|
*.o
|
||||||
|
*.so
|
||||||
|
*.app
|
||||||
|
|
||||||
|
# Packages #
|
||||||
|
############
|
||||||
|
# it's better to unpack these files and commit the raw source
|
||||||
|
# git has its own built in compression methods
|
||||||
|
*.7z
|
||||||
|
*.dmg
|
||||||
|
*.gz
|
||||||
|
*.iso
|
||||||
|
*.jar
|
||||||
|
*.rar
|
||||||
|
*.tar
|
||||||
|
*.zip
|
||||||
|
|
||||||
|
|
||||||
|
#eclipse projects #
|
||||||
|
###################
|
||||||
|
*.classpath
|
||||||
|
*.project
|
||||||
|
.codepro/
|
||||||
|
lib/*.jar
|
||||||
|
build/
|
||||||
|
dist/
|
||||||
|
tmp/
|
||||||
|
logs/
|
||||||
|
eclipse/
|
||||||
|
precompiled/
|
||||||
|
*.settings
|
||||||
|
|
||||||
|
|
||||||
|
# play project #
|
||||||
|
################
|
||||||
|
test-result/
|
||||||
|
db/h2/
|
||||||
|
indicies/
|
||||||
|
index/
|
||||||
|
|
||||||
|
# antlr project #
|
||||||
|
#################
|
||||||
|
gen/
|
||||||
|
*.tokens
|
||||||
|
|
||||||
|
# Logs and databases #
|
||||||
|
######################
|
||||||
|
*.log
|
||||||
|
*.sql
|
||||||
|
*.sqlite
|
||||||
|
|
||||||
|
# OS generated files #
|
||||||
|
######################
|
||||||
|
.DS_Store
|
||||||
|
ehthumbs.db
|
||||||
|
Icon?
|
||||||
|
Thumbs.db
|
||||||
|
|
||||||
|
# Trident specific files #
|
||||||
|
##########################
|
||||||
|
src/com/simplymeasured/trident/Version.java
|
||||||
|
|
||||||
|
# Blog Generated Files #
|
||||||
|
########################
|
||||||
|
_site/
|
||||||
|
|
||||||
|
# Maven Specific Files #
|
||||||
|
target/
|
||||||
|
|
||||||
|
# OS generated files #
|
||||||
|
######################
|
||||||
|
.DS_Store
|
||||||
|
.DS_Store?
|
||||||
|
._*
|
||||||
|
.Spotlight-V100
|
||||||
|
.Trashes
|
||||||
|
ehthumbs.db
|
||||||
|
Thumbs.db
|
@ -4,7 +4,10 @@ set -g prefix C-a
|
|||||||
unbind r
|
unbind r
|
||||||
bind r source-file ~/.config/tmux/tmux.conf
|
bind r source-file ~/.config/tmux/tmux.conf
|
||||||
|
|
||||||
|
unbind h
|
||||||
bind h split-window -v
|
bind h split-window -v
|
||||||
|
|
||||||
|
unbind v
|
||||||
bind v split-window -h
|
bind v split-window -h
|
||||||
|
|
||||||
# set -g mouse on
|
# set -g mouse on
|
||||||
|
Loading…
x
Reference in New Issue
Block a user