aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--alias1
-rw-r--r--tigrc7
2 files changed, 5 insertions, 3 deletions
diff --git a/alias b/alias
index d0bace4..8c4497f 100644
--- a/alias
+++ b/alias
@@ -148,6 +148,7 @@ alias cdS='cd ~/git/StreetComplete'
148alias and='cd ~/git/geoBingAn.Android' 148alias and='cd ~/git/geoBingAn.Android'
149alias mm='mkvmerge -o out.webm -w 01.webm + 02.webm' 149alias mm='mkvmerge -o out.webm -w 01.webm + 02.webm'
150alias cdc='cd ~/git/openmaptiles/layers/transportation' 150alias cdc='cd ~/git/openmaptiles/layers/transportation'
151alias cdl='cd ~/git/LiveVideoBroadcaster'
151 152
152repo='git@github.com' 153repo='git@github.com'
153typebrook='git@github.com:typebrook' 154typebrook='git@github.com:typebrook'
diff --git a/tigrc b/tigrc
index 0ad95ee..964a067 100644
--- a/tigrc
+++ b/tigrc
@@ -102,9 +102,9 @@ bind main pu ?git pull
102bind main pU ?git pull '%(prompt Which remote? )' %(branch):%(branch) 102bind main pU ?git pull '%(prompt Which remote? )' %(branch):%(branch)
103 103
104# reset/rebase/revert 104# reset/rebase/revert
105bind main u ?git reset %(commit) 105bind main uu ?git reset %(commit)
106bind main U ?sh -c "git reset %(commit) && git stash push -m 'deprecated from reset'" 106bind main us ?sh -c "git reset %(commit) && git stash push -m 'deprecated from reset'"
107bind main gu ?git reset %(commit) --hard 107bind main uh ?git reset %(commit) --hard
108bind main R !?git rebase -i %(commit) 108bind main R !?git rebase -i %(commit)
109bind main ! ?git revert %(commit) 109bind main ! ?git revert %(commit)
110 110
@@ -114,6 +114,7 @@ bind main TN !git tag "%(prompt Enter tag name: )" %(commit) -a
114bind main Ts >tig show %(tag) 114bind main Ts >tig show %(tag)
115bind main Td @git tag -d "%(prompt Delete tag: )" 115bind main Td @git tag -d "%(prompt Delete tag: )"
116bind main Tp ?git push --tags 116bind main Tp ?git push --tags
117bind main pt ?git push %(remote) %(tag)
117bind main TTd @git tag -d %(tag) 118bind main TTd @git tag -d %(tag)
118 119
119# android 120# android