Skip to content

Commit

Permalink
🔧 add delta to prettier diffs + update git aliases to use delta
Browse files Browse the repository at this point in the history
  • Loading branch information
wingy3181 committed Sep 8, 2024
1 parent 87faaca commit 3ddc479
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 7 deletions.
38 changes: 31 additions & 7 deletions src/git/gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,35 @@

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

d = diff -- . ':!*package-lock.json' ':!*yarn.lock'
d = diff -- . ':!*package-lock.json' ':!*yarn.lock'

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

dc = diff --cached -- . ':!*package-lock.json' ':!*yarn.lock'
dc = diff --cached -- . ':!*package-lock.json' ':!*yarn.lock'

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

dd = "!f() { \
git d | delta; \
}; f"

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

ddc = "!f() { \
git dc | delta; \
}; f"

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

dds = "!f() { \
git d | delta --side-by-side; \
}; f"

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

ddcs = "!f() { \
git dc | delta --side-by-side; \
}; f"

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Expand All @@ -90,7 +114,7 @@

# Show custom text-based graphical log of the commit history.

g = log --graph --pretty=custom
g = log --graph --pretty=custom

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Expand All @@ -102,13 +126,13 @@

# Show custom log of the commit history.

l = log --pretty=custom
l = log --pretty=custom

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

# List contributors.

lc = shortlog --email --summary --numbered --summary
lc = shortlog --email --summary --numbered --summary

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Expand Down Expand Up @@ -150,11 +174,11 @@

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

p = push
p = push

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

r = rebase
r = rebase

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Expand Down
1 change: 1 addition & 0 deletions src/os/installs/macos/cli_utilities.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" \
print_in_purple "\n CLI Utilities\n\n"

brew_install_with_confirmation "bat" "bat"
brew_install_with_confirmation "delta" "delta"
brew_install_with_confirmation "jq" "jq"
# zoxide is optionally dependent on fzf
brew_install_with_confirmation "fzf" "fzf"
Expand Down

0 comments on commit 3ddc479

Please sign in to comment.