Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to parsing JSON layout files. #1

Merged
merged 1 commit into from
Jun 11, 2013

Conversation

zestyping
Copy link

No description provided.

@zestyping
Copy link
Author

Oh my god this was hard to do with git.

Problem: send you a pull request for just one commit.

Solution:

  531  git commit python_clients/spatial_stripes.py 
  532  git push
  533  git status
  534  git log
  535  git checkout -b longears longears/master
  536  git help checkout
  537  git remote
  538  git help remote
  539  git remote show
  540  git remote add
  541  git remote show origin
  542  git help remote
  543  git remote -v
  544  git remote
  545  git remote add longears [email protected]:longears/openpixelcontrol.git
  546  git help pull
  547  git help pull
  548  git help checkout
  549  git checkout -b longears
  550  git pull longears
  551  git pull longears/master
  552  git pull longears master
  553  git help pull
  554  git log
  555  git help
  556  git branch
  557  git log -b longears
  560  git log
  561  git checkout 39a79fb08dbb559c386b720643411e476f2d3eb0
  562  git checkout -b longears
  563  git cherry-pick 286b3ad0604afb941f4e82faedddbc33bd13bf99
  564  git checkout longears
  565  git branch
  566  git branch -v
  567  git reset --hard
  568  git update-ref longears 39a79fb08dbb559c386b720643411e476f2d3eb0
  569  git checkout longears
  570  git log
  571  git status
  574  git cherry-pick 286b3ad0604afb941f4e82faedddbc33bd13bf99
  576  git reset
  577  git cherry-pick 286b3ad0604afb941f4e82faedddbc33bd13bf99
  578  git help reset
  579  git reset 39a79fb08dbb559c386b720643411e476f2d3eb0
  580  git status
  581  git reset --hard 39a79fb08dbb559c386b720643411e476f2d3eb0
  582  git log
  583  git status
  584  git cherry-pick 286b3ad0604afb941f4e82faedddbc33bd13bf99
  585  git log
  586  git checkout -b master
  587  git checkout master
  588  rm layouts/*.json
  589  git checkout master
  590  git log
  591  git reset --hard
  592  ls
  593  ls layouts/
  594  ls python_clients/
  595  git help push
  597  git push -n
  598  git pull -n
  599  git pull
  600  git push origin
  601  git push origin longears

longears added a commit that referenced this pull request Jun 11, 2013
Switch to parsing JSON layout files.
@longears longears merged commit 2ffec8b into longears:master Jun 11, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants