diff options
| author |   Matthew Brewer <tomboy64@sina.cn> | 2016-06-01 17:45:45 +0200 |
|---|---|---|
| committer | Matthew Brewer <tomboy64@sina.cn> | 2016-06-01 17:45:45 +0200 |
| commit | 858628b3a2b54f15cd08b396b351f2441fde785e (patch) | |
| tree | b9759ea97c2c1f0d644519f157966a45402f1337 /tools | |
| parent | make umounts --lazy for chroot-here.sh (diff) | |
| download | tbc-858628b3a2b54f15cd08b396b351f2441fde785e.tar.gz tbc-858628b3a2b54f15cd08b396b351f2441fde785e.tar.bz2 tbc-858628b3a2b54f15cd08b396b351f2441fde785e.zip | |
update ortrta.sh
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ortrta.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/ortrta.sh b/tools/ortrta.sh index 7b1d950..0d5d38f 100755 --- a/tools/ortrta.sh +++ b/tools/ortrta.sh @@ -35,7 +35,8 @@ repoman_this() { choose() { while [[ true ]]; do - echo -n "(e)dit, (r)epoman full all ebuilds, (c)ontinue or e(x)it? " + echo + echo -n "(e)dit, (r)epoman full affected dirs, (d)iff, (n)ext commit, exit (w)ith saving or e(x)it w/o saving? " read -n1 -r response printf '\r' @@ -43,10 +44,13 @@ choose() { echo case ${response} in + d ) + git diff --find-renames --find-copies --find-copies-harder --color=always HEAD^ | cat + ;; e ) exit 0 ;; - c ) + n ) git rebase --continue 2>&1 | head -n1 return ;; @@ -54,6 +58,12 @@ choose() { repoman_this return ;; + w ) + for i in $(seq $(GIT_EDITOR='cat' git rebase --edit-todo | grep -v '^#' | wc -l) -1 0); do + git rebase --continue 2>&1 | head -n1 + echo "left: ${i}" + done + ;; x ) echo "Aborting rebase..." git rebase --abort |