Compare commits

..

No commits in common. "0bd3008dc20584fe86a5dbcb07537022d74ad1a6" and "845cdd62c9e0038dd44a951f3f49bb23242fb320" have entirely different histories.

4 changed files with 13 additions and 29 deletions

View File

@ -9,43 +9,23 @@
path = ~/b1/customer/sap/.config/git/config
[alias]
# branches
branches = branch -a
sb = switch
sc = switch -c
# commits
co = checkout
cn = checkout -b
cm = commit -m
l = log --pretty='format:%h %G? %s%d' -n10 --graph --color
fixup = "!git log -n50 --pretty='format:%h %s' --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup"
ri = "rebase -i"
# push
pushf = "push --force-with-lease"
# log
l = log --pretty='format:%h %G? %s%d' -n20 --graph --color
fzs = "!git log -n50 --pretty='format:%h %s' --no-merges | fzf | cut -c -7 | xargs -o git show"
# status
tags = tag -l
branches = branch -a
remotes = remote -v
s = status -sb
ss = s -uno
# other
tags = tag -l
remotes = remote -v
[color]
diff = auto
[column]
ui = auto
[init]
defaultBranch = main
[branch]
sort = -committerdate
[rebase]
autosquash = true

View File

@ -2,7 +2,7 @@
add_newline = false
format = '''\[[$username $hostname](bold green)\] $directory$python$fill$time$fill$container$git_branch$git_commit$git_state$git_status
format = '''\[[$username $hostname](bold green)\] $directory$fill$time$fill$container$git_branch$git_commit$git_state$git_status
$character[\$](bold green) '''
right_format = '''$elixir$elm$cmd_duration'''

View File

@ -6,6 +6,8 @@ end_of_line = lf
indent_style = tab
trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
indent_size = 4
indent_style = space
@ -13,3 +15,7 @@ indent_style = space
indent_size = 2
indent_style = space
[*.py]
indent_style = space
indent_size = 4

View File

@ -75,6 +75,4 @@ command -v zoxide &>/dev/null && eval "$(zoxide init --cmd cd bash)"
export XBPS_DISTDIR="$HOME/git/void-packages"
export SVDIR="$HOME/sv"
export PASSWORD_STORE_ENABLE_EXTENSIONS=true
export PASSWORD_STORE_EXTENSION_COMMANDS="tessen otp"