update

2 files changed, 8 insertions, 3 deletions

diff --git a/alias b/alias
index cb59791..bdaa474 100644
--- a/alias
+++ b/alias
@@ -7,6 +7,7 @@ alias zshrc="vim ~/.zshrc && source ~/.$(basename $SHELL)rc"
 alias bashrc="vim ~/.bashrc && source ~/.$(basename $SHELL)rc"
 alias vimrc='vim ~/.vimrc'
 alias tigrc="vim $SETTING_DIR/tigrc"
+alias muttrc="vim ~/.muttrc"
 alias gitconfig='vim ~/.gitconfig'
 alias log="cat $SETTING_DIR/log | grep '`date +'%b %d'`'"
 
@@ -207,7 +208,11 @@ function image_vertical() {
     convert $@ -append output.png 
 }
 
+# mail mutt
+alias m='mutt'
+
 # misc
+alias foo="echo bar > foo && echo File foo is created && ls -lh foo"
 alias token="cd $SETTING_DIR/tokens && ls -lh"
 alias gr='_grepString'
 function _grepString() { 
diff --git a/tigrc b/tigrc
index 65938b6..785c1dc 100644
--- a/tigrc
+++ b/tigrc
@@ -103,7 +103,7 @@ bind main bbD ?>git branch -D %(branch)
 bind main brd ?git branch -rd %(remote)/%(branch)
 bind main bv +sh -c "git branch -vv | grep %(branch)"
 bind main bm @git branch -m %(branch) "%(prompt New branch name: )"
-bind main bM @git branch -f "%(prompt Move which branch to here? )" %(commit)
+bind main bM @git branch --force "%(prompt Move which branch to here? )" %(commit)
 bind main c @sh -c "git branch --points-at=%(commit) | \
                     sed -n '/^*/ {n;p}' | \
                     (cat -; echo %(commit)) | \
@@ -129,7 +129,7 @@ bind main pp ?git push
 bind main pP ?git push -u %(remote) %(branch):%(branch)
 bind main pr ?git push -u '%(prompt Which remote? )' %(branch):%(branch)
 bind main pR ?git push -u '%(prompt Which remote? )' %(branch):'%(prompt Which branch? )'
-bind main pF ?git push -f
+bind main pF ?git push --force
 bind main pd ?git push %(remote) :%(branch)
 bind generic pD ?git push '%(prompt Delete from which remote? )' :'%(prompt Which reference? )'
 
@@ -234,7 +234,7 @@ bind status D ?>git clean -dfx
 
 # solve conflict
 bind status U ?>git reset --hard
-bind status gc @git clean -f
+bind status gc @git clean --force
 bind status Ba @git rebase --abort
 bind status Bc @git rebase --continue
 bind status <F4> !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\""