| 1 |
commit: 858628b3a2b54f15cd08b396b351f2441fde785e |
| 2 |
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn> |
| 3 |
AuthorDate: Wed Jun 1 15:45:45 2016 +0000 |
| 4 |
Commit: M. B. <tomboy64 <AT> sina <DOT> cn> |
| 5 |
CommitDate: Wed Jun 1 15:45:45 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=858628b3 |
| 7 |
|
| 8 |
update ortrta.sh |
| 9 |
|
| 10 |
tools/ortrta.sh | 14 ++++++++++++-- |
| 11 |
1 file changed, 12 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/tools/ortrta.sh b/tools/ortrta.sh |
| 14 |
index 7b1d950..0d5d38f 100755 |
| 15 |
--- a/tools/ortrta.sh |
| 16 |
+++ b/tools/ortrta.sh |
| 17 |
@@ -35,7 +35,8 @@ repoman_this() { |
| 18 |
|
| 19 |
choose() { |
| 20 |
while [[ true ]]; do |
| 21 |
- echo -n "(e)dit, (r)epoman full all ebuilds, (c)ontinue or e(x)it? " |
| 22 |
+ echo |
| 23 |
+ 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? " |
| 24 |
read -n1 -r response |
| 25 |
|
| 26 |
printf '\r' |
| 27 |
@@ -43,10 +44,13 @@ choose() { |
| 28 |
echo |
| 29 |
|
| 30 |
case ${response} in |
| 31 |
+ d ) |
| 32 |
+ git diff --find-renames --find-copies --find-copies-harder --color=always HEAD^ | cat |
| 33 |
+ ;; |
| 34 |
e ) |
| 35 |
exit 0 |
| 36 |
;; |
| 37 |
- c ) |
| 38 |
+ n ) |
| 39 |
git rebase --continue 2>&1 | head -n1 |
| 40 |
return |
| 41 |
;; |
| 42 |
@@ -54,6 +58,12 @@ choose() { |
| 43 |
repoman_this |
| 44 |
return |
| 45 |
;; |
| 46 |
+ w ) |
| 47 |
+ for i in $(seq $(GIT_EDITOR='cat' git rebase --edit-todo | grep -v '^#' | wc -l) -1 0); do |
| 48 |
+ git rebase --continue 2>&1 | head -n1 |
| 49 |
+ echo "left: ${i}" |
| 50 |
+ done |
| 51 |
+ ;; |
| 52 |
x ) |
| 53 |
echo "Aborting rebase..." |
| 54 |
git rebase --abort |
Archives