diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-04-13 21:31:17 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2014-04-13 21:31:17 +0200 |
| commit | ac11748360bf25c02ea0f8ce171ba019bf9ef45b (patch) | |
| tree | acab29df356566363389fe43d11e032bf8b8162c /.gitconfig | |
| parent | 2c74e0439f3b9ded4b2e8ae9669e3af2d1c8c096 (diff) | |
| download | dotfiles-ac11748360bf25c02ea0f8ce171ba019bf9ef45b.tar.gz dotfiles-ac11748360bf25c02ea0f8ce171ba019bf9ef45b.tar.xz | |
gitconfig: add new alias; xinitrc: misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -16,8 +16,9 @@ b = branch -vv sup = log --all --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b' sp = show --stat -p - mff = merge + mff = merge --ff-only refl = reflog --date=relative + mnf = merge --no-ff [merge] tool = vimdiff conflictstyle = diff3 |