janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/git: small alias fixes

This commit is contained in:
xerus2000 2021-01-03 15:01:11 +01:00
parent 19da4d5723
commit 19b66cfa46
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/git/config
View File

@ -123,7 +123,7 @@
# COMMIT SHORTHANDS # COMMIT SHORTHANDS
cme = commit -v --edit --message cme = commit -v --edit --message
# yadm # yadm
cgit = !yadm cme "config/git:" -- $XDG_CONFIG_HOME/git/config $CONFIG_SHELLS/git $HOME/.local/bin/git-* cgit = !yadm cme "config/git:" -- $XDG_CONFIG_HOME/git $CONFIG_SHELLS/git $HOME/.local/bin/git-*
cvim = !yadm cme "config/nvim:" -- $XDG_CONFIG_HOME/nvim/init* cvim = !yadm cme "config/nvim:" -- $XDG_CONFIG_HOME/nvim/init*
cshell = !yadm cme "config/shell:" -- $CONFIG_SHELLS cshell = !yadm cme "config/shell:" -- $CONFIG_SHELLS
cbin = !yadm cme "bin:" -- $HOME/.local/bin cbin = !yadm cme "bin:" -- $HOME/.local/bin

1
.config/git/ignore
View File

@ -8,6 +8,7 @@
.idea/caches .idea/caches
.idea/markdown-* .idea/markdown-*
.idea/compiler.xml .idea/compiler.xml
.idea/kotlinc.xml
.idea/misc.xml .idea/misc.xml
.idea/modules.xml .idea/modules.xml
.idea/encodings.xml .idea/encodings.xml

4
.config/shell/git
View File

@ -135,8 +135,8 @@ git-withdate() {
gitedit() { gitedit() {
git stash git stash
gitcommits -q $1 gitcommits -q $1
git reset --hard $1 git reset --keep $1
git stash pop -q git stash pop
git-withdate $1 commit --all --amend "${@:2}" git-withdate $1 commit --all --amend "${@:2}"
gitcommits gitcommits
} }

2
.local/bin/git-ready
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# Interactive rebase onto the remote # Interactive rebase onto the remote
remote="$1" remote="$1"
shift test $# -gt 0 && shift
git rebase -i ${remote:-'@{push}'} "$@" git rebase -i ${remote:-'@{push}'} "$@"