Advertisement
Guest User

Untitled

a guest
May 24th, 2018
89
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.64 KB | None | 0 0
  1. pc-141-133:yiancar_qmk_firmware yiangosyiangou$ git reflog
  2. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{0}: checkout: moving from master to wip
  3. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{1}: checkout: moving from wip to master
  4. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{2}: checkout: moving from master to wip
  5. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{3}: checkout: moving from RGB_matrix_fixes to master
  6. 197092360 (origin/RGB_matrix_fixes, RGB_matrix_fixes) HEAD@{4}: checkout: moving from master to RGB_matrix_fixes
  7. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{5}: rebase finished: returning to refs/heads/master
  8. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{6}: rebase: checkout wip
  9. 61f30ba54 HEAD@{7}: reset: moving to 61f30ba5422660ad2c1013ec71e4358fe7c4372e
  10. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{8}: checkout: moving from wip to master
  11. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{9}: checkout: moving from master to wip
  12. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{10}: rebase: updating HEAD
  13. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{11}: rebase: aborting
  14. cb7d35682 HEAD@{12}: rebase: Adds Zlant keyboard support (#3028)
  15. f239744ac HEAD@{13}: rebase: Fix to KC60 LAYOUT_60_ansi matrix (#3026)
  16. 1d3126c3d HEAD@{14}: rebase: Refactor and Configurator update for ACR60 (#3025)
  17. 0e4b60abb HEAD@{15}: rebase: Add edvorakjp layout for the Iris keyboard (#3020)
  18. 5558c9aba HEAD@{16}: rebase: Refactor and Configurator updates for 9key (#3024)
  19. 4d27914f1 HEAD@{17}: rebase: checkout refs/remotes/origin/master
  20. 6ad8130fb (HEAD -> wip, origin/wip, origin/master, origin/HEAD, master) HEAD@{18}: commit (merge): Merge remote-tracking branch 'upstream/master'
  21. 4d27914f1 HEAD@{19}: checkout: moving from master to master
  22. 4d27914f1 HEAD@{20}: checkout: moving from Matrix_RGB to master
  23. 4125fcb6d (origin/Matrix_RGB, Matrix_RGB) HEAD@{21}: checkout: moving from master to Matrix_RGB
  24. 4d27914f1 HEAD@{22}: merge upstream/master: Merge made by the 'recursive' strategy.
  25. a0ffb5454 HEAD@{23}: checkout: moving from RGB_matrix_fixes to master
  26. 197092360 (origin/RGB_matrix_fixes, RGB_matrix_fixes) HEAD@{24}: commit: Update documentation for rgb matrix
  27. b7d62057e HEAD@{25}: merge upstream/master: Merge made by the 'recursive' strategy.
  28. 0c515f0b1 HEAD@{26}: checkout: moving from master to RGB_matrix_fixes
  29. a0ffb5454 HEAD@{27}: merge upstream/master: Merge made by the 'recursive' strategy.
  30. 9f8a82db5 HEAD@{28}: checkout: moving from RGB_matrix_fixes to master
  31. 0c515f0b1 HEAD@{29}: checkout: moving from Modular to RGB_matrix_fixes
  32. 4fcd685cf (origin/Modular, Modular) HEAD@{30}: checkout: moving from RGB_matrix_fixes to Modular
  33. 0c515f0b1 HEAD@{31}: checkout: moving from Matrix_RGB to RGB_matrix_fixes
  34. 4125fcb6d (origin/Matrix_RGB, Matrix_RGB) HEAD@{32}: checkout: moving from RGB_matrix_fixes to Matrix_RGB
  35. 0c515f0b1 HEAD@{33}: merge upstream/master: Merge made by the 'recursive' strategy.
  36. e651a81f1 HEAD@{34}: checkout: moving from Matrix_RGB to RGB_matrix_fixes
  37. 4125fcb6d (origin/Matrix_RGB, Matrix_RGB) HEAD@{35}: pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
  38. c5fd4c5fa HEAD@{36}: rebase finished: returning to refs/heads/Matrix_RGB
  39. c5fd4c5fa HEAD@{37}: rebase: Add support for split matrix RGB
  40. d3031d545 HEAD@{38}: rebase: Remove modular from master
  41. 57e55c3d0 HEAD@{39}: rebase: Added Modular keyboards L,R and NUM
  42. f698bbcd6 HEAD@{40}: rebase: checkout upstream/master
  43. 45eb96605 HEAD@{41}: checkout: moving from HS60_RGB to Matrix_RGB
  44. 4907678c3 (origin/HS60_RGB, HS60_RGB) HEAD@{42}: checkout: moving from master to HS60_RGB
  45. 9f8a82db5 HEAD@{43}: pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
  46. c5efe33b1 HEAD@{44}: rebase finished: returning to refs/heads/master
  47. c5efe33b1 HEAD@{45}: rebase: Remove modular from master
  48. 885f14a5a HEAD@{46}: rebase: Added Modular keyboards L,R and NUM
  49. f698bbcd6 HEAD@{47}: rebase: checkout upstream/master
  50. a5c5f5f19 HEAD@{48}: checkout: moving from master to master
  51. a5c5f5f19 HEAD@{49}: checkout: moving from Bootloader_make_issue to master
  52. 4f4cca877 (origin/Bootloader_make_issue, Bootloader_make_issue) HEAD@{50}: checkout: moving from master to Bootloader_make_issue
  53. a5c5f5f19 HEAD@{51}: checkout: moving from master to master
  54. a5c5f5f19 HEAD@{52}: checkout: moving from HS60_RGB to master
  55. 4907678c3 (origin/HS60_RGB, HS60_RGB) HEAD@{53}: checkout: moving from Matrix_RGB to HS60_RGB
  56. 45eb96605 HEAD@{54}: checkout: moving from HS60_RGB to Matrix_RGB
  57. 4907678c3 (origin/HS60_RGB, HS60_RGB) HEAD@{55}: checkout: moving from master to HS60_RGB
  58. a5c5f5f19 HEAD@{56}: checkout: moving from Matrix_RGB to master
  59. 45eb96605 HEAD@{57}: commit: Add support for split matrix RGB
  60. a5c5f5f19 HEAD@{58}: checkout: moving from master to Matrix_RGB
  61. a5c5f5f19 HEAD@{59}: commit (merge): Merge remote-tracking branch 'upstream/master'
  62. 40a517956 HEAD@{60}: checkout: moving from HS60_RGB to master
  63. 4907678c3 (origin/HS60_RGB, HS60_RGB) HEAD@{61}: checkout: moving from master to HS60_RGB
  64. 40a517956 HEAD@{62}: checkout: moving from HS60_RGB to master
  65. 4907678c3 (origin/HS60_RGB, HS60_RGB) HEAD@{63}: checkout: moving from RGB_matrix_fixes to HS60_RGB
  66. e651a81f1 HEAD@{64}: checkout: moving from HS60_RGB to RGB_matrix_fixes
  67. 4907678c3 (origin/HS60_RGB, HS60_RGB) HEAD@{65}: commit: HS60 ANSI update
  68. 0dac210f3 HEAD@{66}: commit: HS60 ANSI update
  69. 40a517956 HEAD@{67}: Branch: renamed refs/heads/HS60_RGB to refs/heads/HS60_RGB
  70. 40a517956 HEAD@{69}: Branch: renamed refs/heads/HS60 to refs/heads/HS60_RGB
  71. 40a517956 HEAD@{71}: checkout: moving from master to HS60
  72. 40a517956 HEAD@{72}: checkout: moving from HS60_MasterRGB to master
  73. a8bf13752 HEAD@{73}: checkout: moving from master to HS60_MasterRGB
  74. 40a517956 HEAD@{74}: merge upstream/master: Merge made by the 'recursive' strategy.
  75. cd261ffea HEAD@{75}: checkout: moving from HS60_MasterRGB to master
  76. a8bf13752 HEAD@{76}: commit: HS60 ANSI layout addition
  77. 85d40970e HEAD@{77}: checkout: moving from Bootloader_make_issue to HS60_MasterRGB
  78. 4f4cca877 (origin/Bootloader_make_issue, Bootloader_make_issue) HEAD@{78}: merge upstream/master: Merge made by the 'recursive' strategy.
  79. 1624b40b3 HEAD@{79}: commit: quick typo fix
  80. 68470f0e6 HEAD@{80}: commit: fixed bootloader makefile
  81. cd261ffea HEAD@{81}: checkout: moving from HS60_MasterRGB to Bootloader_make_issue
  82. 85d40970e HEAD@{82}: commit: HS60 bootloader change
  83. a002d10fd HEAD@{83}: checkout: moving from master to HS60_MasterRGB
  84. cd261ffea HEAD@{84}: merge upstream/master: Merge made by the 'recursive' strategy.
  85. 68a0a8364 HEAD@{85}: checkout: moving from HS60_MasterRGB to master
  86. a002d10fd HEAD@{86}: pull --no-rebase --progress origin: Fast-forward
  87. e3c35ebbe HEAD@{87}: commit: Remove userspace layouts on HS60
  88. a367a1dc6 HEAD@{88}: commit: More HS60 cleanup
  89. c097998b3 HEAD@{89}: commit: HS60 modifications to work with configurator
  90. 5636ba45e HEAD@{90}: commit: More Cleanup for HS60
  91. 19da26cfa HEAD@{91}: pull --no-rebase --progress origin: Fast-forward
  92. ac964d4ac HEAD@{92}: commit: More HS60 cleanup
  93. e076de9cf HEAD@{93}: commit: Cleanup for HS60 ISO
  94. dd1ac55bc HEAD@{94}: checkout: moving from master to HS60_MasterRGB
  95. 68a0a8364 HEAD@{95}: merge upstream/master: Merge made by the 'recursive' strategy.
  96. 78e929142 HEAD@{96}: checkout: moving from HS60_MasterRGB to master
  97. dd1ac55bc HEAD@{97}: merge upstream/master: Merge made by the 'recursive' strategy.
  98. b7bd63e79 HEAD@{98}: checkout: moving from RGB_matrix_fixes to HS60_MasterRGB
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement