Compare commits
4 Commits
845cdd62c9
...
0bd3008dc2
Author | SHA1 | Date |
---|---|---|
fanyx | 0bd3008dc2 | |
fanyx | cc5ed3a7e6 | |
fanyx | 887b34f708 | |
fanyx | 76181e3fe7 |
|
@ -9,23 +9,43 @@
|
|||
path = ~/b1/customer/sap/.config/git/config
|
||||
|
||||
[alias]
|
||||
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"
|
||||
tags = tag -l
|
||||
# branches
|
||||
branches = branch -a
|
||||
remotes = remote -v
|
||||
sb = switch
|
||||
sc = switch -c
|
||||
|
||||
# commits
|
||||
cm = commit -m
|
||||
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
|
||||
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
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
add_newline = false
|
||||
|
||||
format = '''\[[$username $hostname](bold green)\] $directory$fill$time$fill$container$git_branch$git_commit$git_state$git_status
|
||||
format = '''\[[$username $hostname](bold green)\] $directory$python$fill$time$fill$container$git_branch$git_commit$git_state$git_status
|
||||
$character[\$](bold green) '''
|
||||
right_format = '''$elixir$elm$cmd_duration'''
|
||||
|
||||
|
|
|
@ -6,8 +6,6 @@ end_of_line = lf
|
|||
indent_style = tab
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
|
||||
[*.md]
|
||||
indent_size = 4
|
||||
indent_style = space
|
||||
|
||||
|
@ -15,7 +13,3 @@ indent_style = space
|
|||
indent_size = 2
|
||||
indent_style = space
|
||||
|
||||
[*.py]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
|
||||
|
|
|
@ -75,4 +75,6 @@ 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"
|
||||
|
||||
|
|
Loading…
Reference in New Issue