3c72a3bc3b
- Change `--all` to `--branches --remotes --tags` in order to hide the stash. - Change merge tool to `nvimdiff`. - Change `less` pager settings to use tab size 4 and nowrap.
34 lines
1.5 KiB
INI
34 lines
1.5 KiB
INI
[alias]
|
|
# --branches --remotes --tags (better that --all (no stash))
|
|
lgc = log --graph --date-order --abbrev-commit --decorate --date=format:'%g-%m-%d %H:%M:%S' --format=format:'%C(bold blue)%h%C(reset) %C(bold green)(%ad)%C(reset)%C(dim white) %an %C(red)%G?%C(reset) - %s%C(reset) %C(bold yellow)%C(auto)%d%C(reset)'
|
|
lg = !git lgc --branches --remotes --tags
|
|
lgs = !git --no-pager lg
|
|
|
|
|
|
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
|
|
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
|
|
lg3 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) %C(bold green)(%ar)%C(reset)%C(dim white) %an%C(reset) - %s%C(reset) %C(bold yellow)%d%C(reset)' --all
|
|
lg4 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) %s%C(reset) %C(bold yellow)%d%C(reset)' --all
|
|
|
|
[pull]
|
|
rebase = true
|
|
[init]
|
|
defaultBranch = master
|
|
[credential]
|
|
helper = store
|
|
[user]
|
|
useConfigOnly = true
|
|
[gpg "ssh"]
|
|
allowedSignersFile = ~/.config/git/allowed_ssh_signers
|
|
[core]
|
|
pager = less -S -x4
|
|
|
|
[merge]
|
|
tool = nvimdiff
|
|
[diff]
|
|
tool = nvimdiff
|
|
[difftool "nvimdiff"]
|
|
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
|
|
[difftool]
|
|
prompt = false
|