commit 15cfe78c0a7aa0aed0113bdeaca0f2d509106ae3 parent 2ec332f503eafba60e70c413863febb8b487be11 Author: Alex Balgavy <a.balgavy@gmail.com> Date: Sun, 19 Aug 2018 20:09:30 +0200 Added more git aliases Diffstat:
| M | gitconfig | | | 49 | +++++++++++++++++++++++++++++++++---------------- |
1 file changed, 33 insertions(+), 16 deletions(-)
diff --git a/gitconfig b/gitconfig @@ -1,19 +1,36 @@ [user] -name = <name> -email = EMAIL + name = <name> + email = EMAIL [alias] - # Old lg: - # lg = log --all --color --graph --full-history --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --decorate + s = status + co = checkout + cob = checkout -b + f = fetch --all - s = status - 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 - lg = !"git lg1" - diffs = "diff --staged" - adog = log --all --decorate --oneline --graph - delete-merged-branches = "!git checkout master && git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" - changes = diff --summary --stat - co = checkout - fa = fetch --all - pushf = push --force-with-lease - mergetest = merge --no-commit --no-f + 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 + adog = log --all --decorate --oneline --graph + lg = !"git lg1" + + a = add + ap = add -p + + c = commit + cm = commit -m + cam = commit -a -m + cp = commit -p + + ss = stash save + sp = stash pop + sa = stash apply + sd = stash drop + sl = stash list + + diffs = "diff --staged" + changes = diff --summary --stat + mergetest = merge --no-commit --no-f + delete-merged = "!git checkout master && git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" + pushf = push --force-with-lease + +[merge] + tool = vimdiff