about summary refs log tree commit diff
path: root/configs/shared/git
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2018-07-18T23·53-0400
committerWilliam Carroll <wpcarro@gmail.com>2018-07-19T16·00-0400
commita86c2ddece8fde8a42f1e6031b189d1865b9b211 (patch)
tree77c56fd69f574b697e831fd8c062e7672e342cf2 /configs/shared/git
parente8ca641075b0acfab44fd424f08ab6fa6f630495 (diff)
Prefer stow over hand-rolled solution
After discovering GNU stow on Nix IRC, refactored install and setup
scripts to consume it.

Code is vastly simplified as a result.
Diffstat (limited to 'configs/shared/git')
-rw-r--r--configs/shared/git/.gitconfig21
-rw-r--r--configs/shared/git/.gitignore2
2 files changed, 23 insertions, 0 deletions
diff --git a/configs/shared/git/.gitconfig b/configs/shared/git/.gitconfig
new file mode 100644
index 000000000000..e6d0e7b9bc47
--- /dev/null
+++ b/configs/shared/git/.gitconfig
@@ -0,0 +1,21 @@
+[user]
+	name = William Carroll
+	email = wpcarro@gmail.com
+[alias]
+	recent = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format=\"%(refname:short)\"
+	today = ! git log --date=relative --since=00:00:00 --all --no-merges --oneline --author=\"$(git config --get user.email)\"
+	changed-files = ! git --no-pager diff --name-only $(current_branch) $(git merge-base $(current_branch) master)
+	conflicts = ! git --no-pager diff --name-only --diff-filter=U
+	yday = ! git log --name-only --since=yesterday.midnight --until=today.midnight --author=\"$(git config --get user.email)\"
+	patch-grep = log -p -S
+[credential]
+	helper = osxkeychain
+[push]
+	default = current
+[rebase]
+	autosquash = true
+	autostash = true
+[github]
+	user = wpcarro
+[core]
+	excludesfile = ~/.gitignore
diff --git a/configs/shared/git/.gitignore b/configs/shared/git/.gitignore
new file mode 100644
index 000000000000..0d9002511ec2
--- /dev/null
+++ b/configs/shared/git/.gitignore
@@ -0,0 +1,2 @@
+# Mac
+.DS_Store