From 903b16d79e1198b54fd0a8b2ffa4b560125c5d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Fo=CC=88rster?= Date: Sat, 1 Feb 2025 20:02:37 +0100 Subject: [PATCH] cleanup --- .tigrc | 190 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/.tigrc b/.tigrc index 6b21917..983abe2 100644 --- a/.tigrc +++ b/.tigrc @@ -19,19 +19,19 @@ bind generic b view-refs # # # Blame view bind generic b view-blame -# + # # Cursor -# bind generic J move-page-down -# bind generic K move-page-up -# -# # Copy commit id -# bind generic ` @bash -c "echo -n '%(commit)' | pbcopy" -# -# # Quit tig -# bind generic quit +bind generic J move-page-down +bind generic K move-page-up + +# Copy commit id +bind generic ` @bash -c "echo -n '%(commit)' | pbcopy" + +# Quit tig +bind generic quit # === Commands === -# # Commit +# Commit bind generic C !git commit bind refs C !git commit bind main C !git commit @@ -44,90 +44,90 @@ bind generic P ?git push -u %(remote) %(repo:head) bind generic p ?git push -u -f %(remote) %(repo:head) # Pull -# bind generic U ?git pull %(remote) -# -# # Fetch -# bind generic F ?git fetch %(remote) -# bind main F ?git fetch %(remote) +bind generic U ?git pull %(remote) + +# Fetch +bind generic F ?git fetch %(remote) +bind main F ?git fetch %(remote) # # # Reflog -# bind generic L !sh -c "git reflog --pretty=raw | tig --pretty=raw" -# bind generic _ ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"} -# -# # Reset --hard -# bind main H ?git reset --hard %(commit) -# bind refs H ?git reset --hard %(commit) -# bind status H ?git checkout -- %(file) -# -# # Checkout(move) to branch -# bind main = ?git checkout %(branch) -# bind refs = ?git checkout %(branch) -# # 前に使用していたブランチへ戻る -# bind generic = ?git checkout - -# -# # Merge -# bind main M ?git merge %(branch) -# bind diff M ?git merge %(branch) -# bind refs M ?git merge %(branch) -# bind main m ?git merge %(commit) -# bind diff m ?git merge %(commit) -# -# # Rebase -# bind main R ?git rebase %(branch) -# bind diff R ?git rebase %(branch) -# bind refs R ?git rebase %(branch) -# bind main r ?git rebase %(commit) -# bind diff r ?git rebase %(commit) -# -# # Rebase -i -# bind main i ?git rebase -i %(branch) -# bind diff i ?git rebase -i %(branch) -# bind refs i ?git rebase -i %(branch) -# bind main i ?git rebase -i %(commit) -# bind diff i ?git rebase -i %(commit) -# -# # Rebase options -# bind generic y ?git rebase --continue -# bind generic c ?git rebase --abort -# -# -# # diff -# 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" -# -# # Remove branch -# bind refs D ?git branch -d %(branch) -# bind refs D ?git branch -D %(branch) -# -# # Stash -# bind generic S !git stash -# -# # Revert -# bind main ! ?git revert %(commit) -# -# # Cherry-pick -# bind main k ?git cherry-pick %(commit) -# bind diff k ?git cherry-pick %(commit) -# -# # Create branch -# bind main B ?git checkout -b "%(prompt Enter branch name: )" %(branch) -# bind refs B ?git checkout -b "%(prompt Enter branch name: )" %(branch) -# bind main b ?git checkout -b "%(prompt Enter branch name: )" %(commit) -# -# -# # === Github === -# # Open to brouse -# bind main ; @hub browse -- commit/%(commit) -# bind blame ; @hub browse -- commit/%(commit) -# bind diff ; @hub browse -- commit/%(commit) -# bind tree ; @hub browse -- blob/%(branch)/%(file) -# bind blob ; @hub browse -- blob/%(branch)/%(file) -# bind grep ; @hub browse -- blob/%(branch)/%(file) -# -# # Pull request -# bind main 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 -# -# # === Theme === -# # General colors +bind generic L !sh -c "git reflog --pretty=raw | tig --pretty=raw" +bind generic _ ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"} + +# Reset --hard +bind main H ?git reset --hard %(commit) +bind refs H ?git reset --hard %(commit) +bind status H ?git checkout -- %(file) + +# Checkout(move) to branch +bind main = ?git checkout %(branch) +bind refs = ?git checkout %(branch) +# 前に使用していたブランチへ戻る +bind generic = ?git checkout - + +# Merge +bind main M ?git merge %(branch) +bind diff M ?git merge %(branch) +bind refs M ?git merge %(branch) +bind main m ?git merge %(commit) +bind diff m ?git merge %(commit) + +# Rebase +bind main R ?git rebase %(branch) +bind diff R ?git rebase %(branch) +bind refs R ?git rebase %(branch) +bind main r ?git rebase %(commit) +bind diff r ?git rebase %(commit) + +# Rebase -i +bind main i ?git rebase -i %(branch) +bind diff i ?git rebase -i %(branch) +bind refs i ?git rebase -i %(branch) +bind main i ?git rebase -i %(commit) +bind diff i ?git rebase -i %(commit) + +# Rebase options +bind generic y ?git rebase --continue +bind generic c ?git rebase --abort + + +# diff +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" + +# Remove branch +bind refs D ?git branch -d %(branch) +bind refs D ?git branch -D %(branch) + +# Stash +bind generic S !git stash + +# Revert +bind main ! ?git revert %(commit) + +# Cherry-pick +bind main k ?git cherry-pick %(commit) +bind diff k ?git cherry-pick %(commit) + +# Create branch +bind main B ?git checkout -b "%(prompt Enter branch name: )" %(branch) +bind refs B ?git checkout -b "%(prompt Enter branch name: )" %(branch) +bind main b ?git checkout -b "%(prompt Enter branch name: )" %(commit) + + +# === Github === +# Open to brouse +bind main ; @hub browse -- commit/%(commit) +bind blame ; @hub browse -- commit/%(commit) +bind diff ; @hub browse -- commit/%(commit) +bind tree ; @hub browse -- blob/%(branch)/%(file) +bind blob ; @hub browse -- blob/%(branch)/%(file) +bind grep ; @hub browse -- blob/%(branch)/%(file) + +# Pull request +bind main 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 + +# === Theme === +# General colors