diff options
| author | Bill Peckham <bpeckham@google.com> | 2018-09-21 15:58:16 -0700 |
|---|---|---|
| committer | Bill Peckham <bpeckham@google.com> | 2018-09-24 18:35:06 +0000 |
| commit | 76da659f67a0363e75756bbfb66bb7e8c90cf054 (patch) | |
| tree | 427b6effbbdd9fe54776bd8e929e8f60c75d983d /debuggerd/handler/debuggerd_handler.cpp | |
| parent | 444b55f41abdc074774a181cf3a0312bc5648a5b (diff) | |
| parent | da80bd5ef5847eb48c52dcc30531c400488ec174 (diff) | |
Fix broken history.
History broken by
https://keystone-qcom-review.googlesource.com/c/platform/system/core/+/36032/3
Merge commit 'da80bd5ef5847eb48c52dcc30531c400488ec174' (from the QP1A.180823.001
platform update) on q-keystone-qcom-dev using these commands. Starting point was
tip of q-keystone-qcom-dev. Commands used (edited for brevity).
7759 [2018-09-21 15:57:13 -0700] cd system/core/
7761 [2018-09-21 15:57:19 -0700] git checkout q-keystone-qcom-dev
7762 [2018-09-21 15:57:45 -0700] git merge --no-commit --strategy=ours da80bd5ef5847eb48c52dcc30531c400488ec174
7763 [2018-09-21 15:58:16 -0700] git commit
7764 [2018-09-21 15:58:52 -0700] git status
7765 [2018-09-21 15:58:54 -0700] git log
7766 [2018-09-21 15:59:03 -0700] git push origin HEAD:refs/for/q-keystone-qcom-dev/fix-broken-history
Change-Id: I3b4305a4269a8b2cd65a15488ae04cb755a4ec40
Diffstat (limited to 'debuggerd/handler/debuggerd_handler.cpp')
0 files changed, 0 insertions, 0 deletions