| 1 | [9 Mar 2017 17:57:20, git pull -v -v -v --rebase origin master]
|
|---|
| 2 |
|
|---|
| 3 | 17:57:20.631000 git.c:371 trace: built-in: git 'pull' '-v' '-v' '-v' '--rebase' 'origin' 'master'
|
|---|
| 4 | 17:57:20.647000 run-command.c:356 trace: run_command: 'merge-base' '--fork-point' 'refs/remotes/origin/master' 'master'
|
|---|
| 5 | 17:57:20.727000 run-command.c:356 trace: run_command: 'fetch' '--update-head-ok' '-v' '-v' '-v' 'origin' 'master'
|
|---|
| 6 | 17:57:20.762000 exec_cmd.c:116 trace: exec: 'git' 'fetch' '--update-head-ok' '-v' '-v' '-v' 'origin' 'master'
|
|---|
| 7 | 17:57:20.780000 git.c:371 trace: built-in: git 'fetch' '--update-head-ok' '-v' '-v' '-v' 'origin' 'master'
|
|---|
| 8 | 17:57:20.792000 run-command.c:356 trace: run_command: 'git-remote-https' 'origin' 'https://dmik@github.com/dmik/os2-tools.git'
|
|---|
| 9 | 17:57:21.493000 run-command.c:356 trace: run_command: 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet'
|
|---|
| 10 | 17:57:21.565000 run-command.c:356 trace: run_command: 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet'
|
|---|
| 11 | 17:57:21.598000 exec_cmd.c:116 trace: exec: 'git' 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet'
|
|---|
| 12 | 17:57:21.610000 git.c:371 trace: built-in: git 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet'
|
|---|
| 13 | From https://github.com/dmik/os2-tools
|
|---|
| 14 | * branch master -> FETCH_HEAD
|
|---|
| 15 | = [up to date] master -> origin/master
|
|---|
| 16 | 17:57:21.649000 run-command.c:1140 run_processes_parallel: preparing to run up to 1 tasks
|
|---|
| 17 | 17:57:21.649000 run-command.c:1172 run_processes_parallel: done
|
|---|
| 18 | 17:57:21.649000 run-command.c:356 trace: run_command: 'gc' '--auto'
|
|---|
| 19 | 17:57:21.680000 exec_cmd.c:116 trace: exec: 'git' 'gc' '--auto'
|
|---|
| 20 | 17:57:21.692000 git.c:371 trace: built-in: git 'gc' '--auto'
|
|---|
| 21 | 17:57:21.713000 run-command.c:356 trace: run_command: 'rebase' '-v' '-v' '-v' '--onto' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58'
|
|---|
| 22 | 17:57:21.745000 exec_cmd.c:116 trace: exec: 'git' 'rebase' '-v' '-v' '-v' '--onto' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58'
|
|---|
| 23 | 17:57:21.756000 git.c:600 trace: exec: 'git-rebase' '-v' '-v' '-v' '--onto' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58'
|
|---|
| 24 | 17:57:21.756000 run-command.c:356 trace: run_command: 'git-rebase' '-v' '-v' '-v' '--onto' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58'
|
|---|
| 25 | 17:57:21.934000 git.c:371 trace: built-in: git 'rev-parse' '--parseopt' '--stuck-long' '--' '-v' '-v' '-v' '--onto' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58'
|
|---|
| 26 | 17:57:22.005000 git.c:371 trace: built-in: git 'rev-parse' '--git-dir'
|
|---|
| 27 | 17:57:22.057000 git.c:371 trace: built-in: git 'rev-parse' '--git-path' 'objects'
|
|---|
| 28 | 17:57:22.116000 git.c:371 trace: built-in: git 'rev-parse' '--is-bare-repository'
|
|---|
| 29 | 17:57:22.147000 git.c:371 trace: built-in: git 'rev-parse' '--show-toplevel'
|
|---|
| 30 | 17:57:22.215000 git.c:371 trace: built-in: git 'config' '--bool' 'rebase.stat'
|
|---|
| 31 | 17:57:22.313000 git.c:371 trace: built-in: git 'config' '--bool' 'rebase.autostash'
|
|---|
| 32 | 17:57:22.356000 git.c:371 trace: built-in: git 'config' '--bool' 'rebase.autosquash'
|
|---|
| 33 | 17:57:22.389000 git.c:371 trace: built-in: git 'config' '--bool' 'commit.gpgsign'
|
|---|
| 34 | 17:57:22.438000 git.c:371 trace: built-in: git 'rev-parse' '--verify' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58^0'
|
|---|
| 35 | 17:57:22.495000 git.c:371 trace: built-in: git 'rev-parse' '--verify' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58^0'
|
|---|
| 36 | 17:57:22.538000 git.c:371 trace: built-in: git 'symbolic-ref' '-q' 'HEAD'
|
|---|
| 37 | 17:57:22.602000 git.c:371 trace: built-in: git 'rev-parse' '--verify' 'HEAD'
|
|---|
| 38 | 17:57:22.669000 git.c:371 trace: built-in: git 'rev-parse' '--verify' 'HEAD'
|
|---|
| 39 | 17:57:22.706000 git.c:371 trace: built-in: git 'update-index' '-q' '--ignore-submodules' '--refresh'
|
|---|
| 40 | 17:57:22.739000 git.c:371 trace: built-in: git 'diff-files' '--quiet' '--ignore-submodules'
|
|---|
| 41 | 17:57:22.796000 git.c:371 trace: built-in: git 'diff-index' '--cached' '--quiet' '--ignore-submodules' 'HEAD' '--'
|
|---|
| 42 | 17:57:22.837000 git.c:371 trace: built-in: git 'merge-base' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58' 'c5c1b2b28a3fd5c8efc728755fdfdfb351cd4762'
|
|---|
| 43 | 17:57:22.876000 git.c:371 trace: built-in: git 'rev-parse' '--git-path' 'hooks/pre-rebase'
|
|---|
| 44 | Changes from 19478fdb4a487ac8b15ace34213f7e4b39afc6ca to 6e98ac2b6345ad3f1df07d5281e4384a6fa11d58:
|
|---|
| 45 | 17:57:23.012000 git.c:371 trace: built-in: git 'diff' '--stat' '--summary' '19478fdb4a487ac8b15ace34213f7e4b39afc6ca' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58'
|
|---|
| 46 | se.cmd | 25 ++++++++++++++++++-------
|
|---|
| 47 | 1 file changed, 18 insertions(+), 7 deletions(-)
|
|---|
| 48 | First, rewinding head to replay your work on top of it...
|
|---|
| 49 | 17:57:23.126000 git.c:371 trace: built-in: git 'checkout' '-q' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58^0'
|
|---|
| 50 | 17:57:23.182000 git.c:371 trace: built-in: git 'update-ref' 'ORIG_HEAD' 'c5c1b2b28a3fd5c8efc728755fdfdfb351cd4762'
|
|---|
| 51 | 17:57:23.251000 git.c:371 trace: built-in: git 'format-patch' '-k' '--stdout' '--full-index' '--cherry-pick' '--right-only' '--src-prefix=a/' '--dst-prefix=b/' '--no-renames' '--no-cover-letter' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58...c5c1b2b28a3fd5c8efc728755fdfdfb351cd4762'
|
|---|
| 52 | 17:57:23.307000 git.c:371 trace: built-in: git 'am' '--rebasing' '--resolvemsg=
|
|---|
| 53 | When you have resolved this problem, run "git rebase --continue".
|
|---|
| 54 | If you prefer to skip this patch, run "git rebase --skip" instead.
|
|---|
| 55 | To check out the original branch and stop rebasing, run "git rebase --abort".
|
|---|
| 56 | '
|
|---|
| 57 | 17:57:23.309000 run-command.c:356 trace: run_command: 'mailsplit' '-d4' '-o.git/rebase-apply' '-b' '--'
|
|---|
| 58 | 17:57:23.340000 exec_cmd.c:116 trace: exec: 'git' 'mailsplit' '-d4' '-o.git/rebase-apply' '-b' '--'
|
|---|
| 59 | 17:57:23.374000 git.c:371 trace: built-in: git 'mailsplit' '-d4' '-o.git/rebase-apply' '-b' '--'
|
|---|
| 60 | 17:57:23.489000 git.c:371 trace: built-in: git 'rev-parse' 'HEAD'
|
|---|
| 61 | 17:57:23.526000 git.c:371 trace: built-in: git 'update-ref' '-m' 'rebase finished: refs/heads/master onto 6e98ac2b6345ad3f1df07d5281e4384a6fa11d58' 'refs/heads/master' '6e98ac2b6345ad3f1df07d5281e4384a6fa11d58' 'c5c1b2b28a3fd5c8efc728755fdfdfb351cd4762'
|
|---|
| 62 | 17:57:23.569000 git.c:371 trace: built-in: git 'symbolic-ref' '-m' 'rebase finished: returning to refs/heads/master' 'HEAD' 'refs/heads/master'
|
|---|
| 63 | 17:57:23.631000 git.c:371 trace: built-in: git 'gc' '--auto'
|
|---|
| 64 |
|
|---|
| 65 | [9 Mar 2017 17:57:23, exit code 0, took 3.08 s]
|
|---|
