diff options
| author | Starfall <us@starfall.systems> | 2020-07-17 20:45:52 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-07-17 21:11:10 -0500 |
| commit | 61ce9f69ea9f1a617659ad5760533fd67e0f0d5c (patch) | |
| tree | 988cb55c5244201b4a532786b47600a33d6b7f70 | |
| parent | 5cfc3273cc765238199aadbff98f578b4e588e0b (diff) | |
git: add the rest of our old aliases and config
| -rw-r--r-- | .config/git/config | 11 | ||||
| -rw-r--r-- | README.md | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/.config/git/config b/.config/git/config index e6cebbf..8ddda03 100644 --- a/.config/git/config +++ b/.config/git/config @@ -3,3 +3,14 @@ name = Starfall [init] templateDir = ~/.config/git/template +[log] + mailmmap = true +[pull] + rebase = true +[rebase] + autosquash = true +[alias] + oops = commit --all --amend --no-edit + stashpull = !git stash && git pull && git stash pop + stat = status + tree = log --all --graph --oneline diff --git a/README.md b/README.md index f57a857..6020721 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,9 @@ END >> /etc/ssh/sshd_config * zsh-history-substring-search * zsh-autosuggestions * fortune -* grab our old git config * neovim and port our old vim config * firefox lockwise * autoupdates * krita and tablet support * call out things that were preinstalled here - git, firefox, python -* turn all of this stuff into +* turn all of this stuff into an ansible playbook or something else automatable |