.tigrc

@@ -19,19 +19,19 @@ bind generic    b      view-refs
 #
 # # Blame view
 bind generic    <Esc>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 <Esc><Enter> 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 <Esc><Enter> 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 <Esc>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 <Esc>=      ?git checkout -
-#
-# # Merge
-# bind main    M      ?git merge %(branch)
-# bind diff    M      ?git merge %(branch)
-# bind refs    M      ?git merge %(branch)
-# bind main    <Esc>m ?git merge %(commit)
-# bind diff    <Esc>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    <Esc>r ?git rebase %(commit)
-# bind diff    <Esc>r ?git rebase %(commit)
-#
-# # Rebase -i
-# bind main    <Esc>i      ?git rebase -i %(branch)
-# bind diff    <Esc>i      ?git rebase -i %(branch)
-# bind refs    <Esc>i      ?git rebase -i %(branch)
-# bind main    i ?git rebase -i %(commit)
-# bind diff    i ?git rebase -i %(commit)
-#
-# # Rebase options
-# bind generic    <Esc>y      ?git rebase --continue
-# bind generic    <Esc>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    <Esc>D      ?git branch -D %(branch)
-#
-# # Stash
-# bind generic S !git stash
-#
-# # Revert
-# bind main    !      ?git revert %(commit)
-#
-# # Cherry-pick
-# bind main    <Esc>k      ?git cherry-pick %(commit)
-# bind diff    <Esc>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    <Esc>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 <Esc>=      ?git checkout -
+
+# Merge
+bind main    M      ?git merge %(branch)
+bind diff    M      ?git merge %(branch)
+bind refs    M      ?git merge %(branch)
+bind main    <Esc>m ?git merge %(commit)
+bind diff    <Esc>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    <Esc>r ?git rebase %(commit)
+bind diff    <Esc>r ?git rebase %(commit)
+
+# Rebase -i
+bind main    <Esc>i      ?git rebase -i %(branch)
+bind diff    <Esc>i      ?git rebase -i %(branch)
+bind refs    <Esc>i      ?git rebase -i %(branch)
+bind main    i ?git rebase -i %(commit)
+bind diff    i ?git rebase -i %(commit)
+
+# Rebase options
+bind generic    <Esc>y      ?git rebase --continue
+bind generic    <Esc>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    <Esc>D      ?git branch -D %(branch)
+
+# Stash
+bind generic S !git stash
+
+# Revert
+bind main    !      ?git revert %(commit)
+
+# Cherry-pick
+bind main    <Esc>k      ?git cherry-pick %(commit)
+bind diff    <Esc>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    <Esc>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

functions

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