diff options
| author | Anton Bobov <anton@bobov.name> | 2024-02-21 00:01:46 +0500 |
|---|---|---|
| committer | Anton Bobov <anton@bobov.name> | 2024-02-21 14:38:36 +0500 |
| commit | 0d384bcb7ae84d2db6a3237a0c4e4df3f08c5896 (patch) | |
| tree | 308d6af8e54a766c7a046103fef2f8c7e53288cf | |
| parent | 80ddd8de4b14d0bb828d3b9686dc70536dd9e3fd (diff) | |
[git] Added aliasses for merge and blame
| -rw-r--r-- | files/.gitconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/files/.gitconfig b/files/.gitconfig index d153925..796a37f 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -47,6 +47,7 @@ amend = commit --amend ar = !sh -c 'git archive --format=tar --prefix="$(basename "$PWD")-$1/" $1^{tree} | bzip2 >"$(basename "$PWD")-$1.tar.bz2"' - br = branch --sort=-committerdate + blame = blame -w -C -C -C acm = !git add --all && git commit -m c = commit --verbose co = checkout @@ -58,6 +59,7 @@ dshow = "!f() { GIT_EXTERNAL_DIFF=difft DFT_BACKGROUND=light git show --ext-diff $@; }; f" dlog = "!f() { GIT_EXTERNAL_DIFF=difft DFT_BACKGROUND=light git log -p --ext-diff $@; }; f" fix = commit --amend -C HEAD + try = merge --no-commit --no-ff history-all = "!gitk --all $( git fsck | awk '/dangling commit/ {print $3}'; git log -g --pretty='format:%H')" k = !sh -c 'gitk $1' - ka = !sh -c 'gitk --all' - @@ -101,7 +103,7 @@ [branch] autosetupmerge = always autosetuprebase = local - sort = authordate + sort = -committerdate [rebase] instructionFormat = %s [%an] {%ar} autoStash = true |