Eragos/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'gitbutler/workspace' (#1) from gitbutler/workspace into master

Browse Source 
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
Michael Förster
2025-02-10 19:36:21 +00:00
parent 3cd998b69e 8b53c4cb53
commit 1f64ee6bc9
2 changed files with 103 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
.tigrc
View File

@@ -19,19 +19,19 @@ bind generic b view-refs
# #
# # Blame view # # Blame view
bind generic <Esc>b view-blame bind generic <Esc>b view-blame
#
# # Cursor # # Cursor
# bind generic J move-page-down bind generic J move-page-down
# bind generic K move-page-up bind generic K move-page-up
#
# # Copy commit id # Copy commit id
# bind generic ` @bash -c "echo -n '%(commit)' | pbcopy" bind generic ` @bash -c "echo -n '%(commit)' | pbcopy"
#
# # Quit tig # Quit tig
# bind generic <Esc><Enter> quit bind generic <Esc><Enter> quit
# === Commands === # === Commands ===
# # Commit # Commit
bind generic C !git commit bind generic C !git commit
bind refs C !git commit bind refs C !git commit
bind main C !git commit bind main C !git commit
@@ -44,90 +44,90 @@ bind generic P ?git push -u %(remote) %(repo:head)
bind generic <Esc>p ?git push -u -f %(remote) %(repo:head) bind generic <Esc>p ?git push -u -f %(remote) %(repo:head)
# Pull # Pull
# bind generic U ?git pull %(remote) bind generic U ?git pull %(remote)
#
# # Fetch # Fetch
# bind generic F ?git fetch %(remote) bind generic F ?git fetch %(remote)
# bind main F ?git fetch %(remote) bind main F ?git fetch %(remote)
# #
# # Reflog # # Reflog
# bind generic L !sh -c "git reflog --pretty=raw | tig --pretty=raw" bind generic L !sh -c "git reflog --pretty=raw | tig --pretty=raw"
# bind generic _ ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"} bind generic _ ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"}
#
# # Reset --hard # Reset --hard
# bind main H ?git reset --hard %(commit) bind main H ?git reset --hard %(commit)
# bind refs H ?git reset --hard %(commit) bind refs H ?git reset --hard %(commit)
# bind status H ?git checkout -- %(file) bind status H ?git checkout -- %(file)
#
# # Checkout(move) to branch # Checkout(move) to branch
# bind main = ?git checkout %(branch) bind main = ?git checkout %(branch)
# bind refs = ?git checkout %(branch) bind refs = ?git checkout %(branch)
# # 前に使用していたブランチへ戻る # 前に使用していたブランチへ戻る
# bind generic <Esc>= ?git checkout - bind generic <Esc>= ?git checkout -
#
# # Merge # Merge
# bind main M ?git merge %(branch) bind main M ?git merge %(branch)
# bind diff M ?git merge %(branch) bind diff M ?git merge %(branch)
# bind refs M ?git merge %(branch) bind refs M ?git merge %(branch)
# bind main <Esc>m ?git merge %(commit) bind main <Esc>m ?git merge %(commit)
# bind diff <Esc>m ?git merge %(commit) bind diff <Esc>m ?git merge %(commit)
#
# # Rebase # Rebase
# bind main R ?git rebase %(branch) bind main R ?git rebase %(branch)
# bind diff R ?git rebase %(branch) bind diff R ?git rebase %(branch)
# bind refs R ?git rebase %(branch) bind refs R ?git rebase %(branch)
# bind main <Esc>r ?git rebase %(commit) bind main <Esc>r ?git rebase %(commit)
# bind diff <Esc>r ?git rebase %(commit) bind diff <Esc>r ?git rebase %(commit)
#
# # Rebase -i # Rebase -i
# bind main <Esc>i ?git rebase -i %(branch) bind main <Esc>i ?git rebase -i %(branch)
# bind diff <Esc>i ?git rebase -i %(branch) bind diff <Esc>i ?git rebase -i %(branch)
# bind refs <Esc>i ?git rebase -i %(branch) bind refs <Esc>i ?git rebase -i %(branch)
# bind main i ?git rebase -i %(commit) bind main i ?git rebase -i %(commit)
# bind diff i ?git rebase -i %(commit) bind diff i ?git rebase -i %(commit)
#
# # Rebase options # Rebase options
# bind generic <Esc>y ?git rebase --continue bind generic <Esc>y ?git rebase --continue
# bind generic <Esc>c ?git rebase --abort bind generic <Esc>c ?git rebase --abort
#
#
# # diff # diff
# bind main D ?sh -c "git diff %(commit)..%(prompt Enter commit ID: ) | tig" bind main D ?sh -c "git diff %(commit)..%(prompt Enter commit ID: ) | tig"
# bind diff D ?sh -c "git diff %(commit)..%(prompt Enter commit ID: ) | tig" bind diff D ?sh -c "git diff %(commit)..%(prompt Enter commit ID: ) | tig"
#
# # Remove branch # Remove branch
# bind refs D ?git branch -d %(branch) bind refs D ?git branch -d %(branch)
# bind refs <Esc>D ?git branch -D %(branch) bind refs <Esc>D ?git branch -D %(branch)
#
# # Stash # Stash
# bind generic S !git stash bind generic S !git stash
#
# # Revert # Revert
# bind main ! ?git revert %(commit) bind main ! ?git revert %(commit)
#
# # Cherry-pick # Cherry-pick
# bind main <Esc>k ?git cherry-pick %(commit) bind main <Esc>k ?git cherry-pick %(commit)
# bind diff <Esc>k ?git cherry-pick %(commit) bind diff <Esc>k ?git cherry-pick %(commit)
#
# # Create branch # Create branch
# bind main B ?git checkout -b "%(prompt Enter branch name: )" %(branch) bind main B ?git checkout -b "%(prompt Enter branch name: )" %(branch)
# bind refs B ?git checkout -b "%(prompt Enter branch name: )" %(branch) bind refs B ?git checkout -b "%(prompt Enter branch name: )" %(branch)
# bind main <Esc>b ?git checkout -b "%(prompt Enter branch name: )" %(commit) bind main <Esc>b ?git checkout -b "%(prompt Enter branch name: )" %(commit)
#
#
# # === Github === # === Github ===
# # Open to brouse # Open to brouse
# bind main ; @hub browse -- commit/%(commit) bind main ; @hub browse -- commit/%(commit)
# bind blame ; @hub browse -- commit/%(commit) bind blame ; @hub browse -- commit/%(commit)
# bind diff ; @hub browse -- commit/%(commit) bind diff ; @hub browse -- commit/%(commit)
# bind tree ; @hub browse -- blob/%(branch)/%(file) bind tree ; @hub browse -- blob/%(branch)/%(file)
# bind blob ; @hub browse -- blob/%(branch)/%(file) bind blob ; @hub browse -- blob/%(branch)/%(file)
# bind grep ; @hub browse -- blob/%(branch)/%(file) bind grep ; @hub browse -- blob/%(branch)/%(file)
#
# # Pull request # Pull request
# bind main w @hub browse -- compare/%(branch)?expand=1 bind main w @hub browse -- compare/%(branch)?expand=1
# bind diff w @hub browse -- compare/%(branch)?expand=1 bind diff w @hub browse -- compare/%(branch)?expand=1
# bind refs w @hub browse -- compare/%(branch)?expand=1 bind refs w @hub browse -- compare/%(branch)?expand=1
#
# # === Theme === # === Theme ===
# # General colors # General colors

17
functions
View File

@@ -7,15 +7,14 @@ udot() {
remote=$(git ls-remote origin | awk "/HEAD/ {print \$1}") remote=$(git ls-remote origin | awk "/HEAD/ {print \$1}")
gstatus=$(git status --porcelain) gstatus=$(git status --porcelain)
echo -e "" echo -e ' ____ U ___ u _____ _____ _ U _____ u ____ '
echo -e ' ____ U ___ u _____ _____ _ U _____ u ____ ' echo -e ' | _"\ \/"_ \/|_ " _| |" ___| ___ |"| \| ___"|// __"| u'
echo -e ' | _"\ \/"_ \/|_ " _| |" ___| ___ |"| \| ___"|// __"| u ' echo -e '/| | | | | | | | | | U| |_ u |_"_| U | | u | _|" <\___ \/ '
echo -e ' /| | | | | | | | | | U| |_ u |_"_| U | | u | _|" <\___ \/ ' echo -e 'U| |_| |\.-,_| |_| | /| |\ \| _|/ | | \| |/__ | |___ u___) | '
echo -e ' U| |_| |\.-,_| |_| | /| |\ \| _|/ | | \| |/__ | |___ u___) | ' echo -e ' |____/ u \_)-\___/ u |_|U |_| U/| |\u |_____| |_____| |____/>>'
echo -e ' |____/ u \_)-\___/ u |_|U |_| U/| |\\u |_____| |_____| |____/>> ' echo -e ' |||_ \\ _// \\_ ) ( \\,-.-,_ // \\ )( (__) '
echo -e ' |||_ \\\\ _// \\\\_ )(\\\\,-.-,_|___|_,-.// \\\\ << >> )( (__)' echo -e ' (__)_) (__) (__) (__)(__) (_/ \_) (_/ (_") (__) (_/ \_) '
echo -e ' (__)_) (__) (__) (__)(__)(_/ \_)-´ `-(_/(_")("_)(__) (__)(__) ' echo -e ''
echo -e ""
echo -e "$info" echo -e "$info"
echo -e "" echo -e ""