diff options
author | typebrook <typebrook@gmail.com> | 2019-04-10 10:43:57 +0800 |
---|---|---|
committer | typebrook <typebrook@gmail.com> | 2019-04-10 11:05:17 +0800 |
commit | 7b0f8bafe7879da4269e8d5ab9b298d541c60a14 (patch) | |
tree | ad712073c219989c9f243f8ed452e4ead2b048d3 | |
parent | 3ae3d784b90f201043172f2868d2241a89f49177 (diff) |
update
-rw-r--r-- | TODO | 1 | ||||
-rw-r--r-- | tigrc | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -0,0 +1 @@ | |||
- Make contab adding smart | |||
@@ -82,6 +82,8 @@ bind main 3 >git commit --allow-empty -m "%(prompt Empty commit, enter message: | |||
82 | # merge | 82 | # merge |
83 | bind main m ?git merge %(commit) | 83 | bind main m ?git merge %(commit) |
84 | bind main M ?git merge %(branch) --no-ff | 84 | bind main M ?git merge %(branch) --no-ff |
85 | bind main gm ?git merge %(repo:remote) | ||
86 | bind main gM ?git merge %(repo:remote) --no-ff | ||
85 | 87 | ||
86 | # push | 88 | # push |
87 | bind main p none | 89 | bind main p none |