diff options
| author | Johannes Löthberg <johannes@kyriasis.com> | 2016-01-14 16:46:21 +0000 |
|---|---|---|
| committer | Johannes Löthberg <johannes@kyriasis.com> | 2016-01-14 16:46:21 +0000 |
| commit | 7666a9cc93c079cd3a61ea8a7d4cf3103a74c56e (patch) | |
| tree | e1e1b32e1666bead6a6ac7327bd2e253e989e80e /git | |
| parent | cee153e1d03f215139ba6d74a8cd8fe039213992 (diff) | |
| parent | 81873932548d4dda5345c19c3a635d53e25da061 (diff) | |
| download | dotfiles-7666a9cc93c079cd3a61ea8a7d4cf3103a74c56e.tar.xz | |
Merge remote-tracking branch 'k-kyrias/master' into theos
Diffstat (limited to 'git')
| -rw-r--r-- | git/config | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -6,7 +6,7 @@ [alias] amend = commit --amend --verbose br = branch - ci = commit --verbose + ci = commit --verbose --signoff co = checkout di = diff dc = diff --cached @@ -14,6 +14,7 @@ follow = log --oneline --follow --stat --summary -- last = log -1 HEAD lg = log --oneline --decorate + lol = log --oneline --graph --decorate --all mend = commit --amend --reuse-message HEAD mrproper = !git reset --hard HEAD && git clean -fdx ours = !git checkout --ours $@ @@ -21,7 +22,6 @@ rbc = rebase --continue rbs = rebase -i re = rebase - rec = rebase --continue st = status stat = diff --stat statc = diff --cached --stat @@ -34,6 +34,7 @@ wdiff = diff --word-diff wshow = show --word-diff fpush = push --force-with-lease + shortdesc = !git --no-pager log -1 --pretty='tformat:%h (%s, %ad)' --date=short [advice] detachedHead = false @@ -122,3 +123,5 @@ [credential "https://github.com"] username = kyrias helper = pass +[rerere] + enabled = true |