diff options
| author | Florian Pritz <bluewind@xinu.at> | 2018-10-17 00:01:26 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2018-10-17 00:01:26 +0200 |
| commit | 8b1ec7f8264dc6edf87f6d78e7d0a357e4f7b98a (patch) | |
| tree | 42b816a3d32cf0cfeaa0c5ba8b327aa1d13e65ca /.gitconfig | |
| parent | aaabab2166a772bfa91d6b923006d489b9d5a956 (diff) | |
| download | dotfiles-8b1ec7f8264dc6edf87f6d78e7d0a357e4f7b98a.tar.gz dotfiles-8b1ec7f8264dc6edf87f6d78e7d0a357e4f7b98a.tar.xz | |
gitconfig: sort branch list and improve fetch alias
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -13,7 +13,7 @@ d = diff --stat -p am = am -s c = cherry -v - b = branch -vv + b = branch -vv --sort=committerdate sup = log --all --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b' sp = show --stat -p mff = merge --ff-only @@ -26,7 +26,8 @@ ri = rebase -i --autosquash fix = commit --fixup list-branches = branch --sort=committerdate --format='%(HEAD) %(color:red)%(objectname:short)%(color:reset) %(align:30)%(color:yellow)%(refname:short)%(color:reset)%(end) %(align:30)(%(color:green)%(committerdate:relative)%(color:reset))%(end) %(align:20)%(authorname)%(end) %(contents:subject)' - f = fetch -p --all + f = fetch -p + fa = fetch -p --all [merge] tool = kdiff3 conflictstyle = diff3 |