diff options
| author | srdusr <trevorgray@srdusr.com> | 2025-08-30 20:15:06 +0200 |
|---|---|---|
| committer | srdusr <trevorgray@srdusr.com> | 2025-08-30 20:15:06 +0200 |
| commit | 1d8f374267cbe9745c4d9309e7e1255f1523873b (patch) | |
| tree | a9305cd5ab8f55a4562cac42e91b62059f33bb10 | |
| parent | 728a0eb8e08e7a665453882b4043d59910f15a94 (diff) | |
| download | dotfiles-1d8f374267cbe9745c4d9309e7e1255f1523873b.tar.gz dotfiles-1d8f374267cbe9745c4d9309e7e1255f1523873b.zip | |
Initial files
| -rw-r--r-- | .gitconfig | 28 | ||||
| -rw-r--r-- | .gitignore | 48 |
2 files changed, 76 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..8b2ef30 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,28 @@ +[user] + name = srdusr + email = trevorgray@srdusr.com +[init] + defaultBranch = main +[color] + ui = true +[alias] + graph = log --oneline --graph --decorate + ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate + ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat + lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short + conflicts = diff --name-only --diff-filter=U + local-branches = !git branch -vv | cut -c 3- | awk '$3 !~/\\[/ { print $1 }' + recent-branches = !git branch --sort=-committerdate | head + authors = !git log --format='%aN <%aE>' | grep -v 'users.noreply.github.com' | sort -u --ignore-case + sba ="!f() { git subtree add --prefix $2 $1 main; }; f" + sbu ="!f() { git subtree pull --prefix $2 $1 main; }; f" + stashrebase = "!f() { if [ \"$(git symbolic-ref --short HEAD)\" = \"main\" ]; then git stash save && git fetch && git rebase origin main && git stash apply; else git stash save && git fetch && git rebase origin master && git stash apply; fi; }; f" + dotfiles = "!f() { git --git-dir=$HOME/.cfg --work-tree=$HOME stashrebase; }; f" + + +[credential "https://github.com"] + helper = + helper = !/usr/bin/gh auth git-credential +[credential "https://gist.github.com"] + helper = + helper = !/usr/bin/gh auth git-credential diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dc6a064 --- /dev/null +++ b/.gitignore @@ -0,0 +1,48 @@ +.cfg +install.sh +# Ignore Packer's compiled files +packer_compiled.lua + +# Ignore Zsh plugins directory +~/.config/zsh/plugins + +# Ignore zcompdump files +zcompdump + +# Ignore .DS_Store files (macOS) +*.DS_Store + +# Ignore .git directory +.git/ + +# Ignore .spl files +*.spl + +# Ignore node_modules directory +node_modules/ + +## Ignore .png files +#*.png + +# Ignore .zip files +*.zip + +# Ignore .pxd files +*.pxd + +# Ignore .local directory +#^.local/ + +# Ignore .cache directory +^.cache/ + +# Ignore downloads directory +^downloads/ + +# Ignore music directory +^music/ + +^images/ +^pictures/ +^machines/ + |
