Advertisement
Guest User

Untitled

a guest
Jun 18th, 2017
516
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.32 KB | None | 0 0
  1. karen@laesa:~/Code/milestone-a$ git rebase -i origin/next
  2. Finished one cherry-pick.
  3. # Not currently on any branch.
  4. nothing to commit (working directory clean)
  5. Could not apply 5d7cdc8... Updates to README talking about Python 2.6
  6. karen@laesa:~/Code/milestone-a$ git log
  7. commit 0d4dca94e51d8d30964ae3bf99a99a98228d3553
  8. Author: jeff <jeff@openhatch.osnetwork>
  9. Date: Tue Aug 31 15:11:26 2010 -0700
  10.  
  11. Revert "Added a note to README about needing apt-pinning on fresh Debian install to get python2.6-dev"
  12. Two commits solve the same problem, one by me (this one) and one by the orig maintainer
  13.  
  14. This reverts commit 7fd80ab62d7393be25193e0317936c5ca483f5e0.
  15.  
  16. commit e891c6892c331b76040154c00e2114e432408982
  17. Author: Jeff Welling <Jeff.Welling@Gmail.com>
  18. Date: Tue Aug 31 15:03:26 2010 -0700
  19. commit 0d4dca94e51d8d30964ae3bf99a99a98228d3553
  20. Author: jeff <jeff@openhatch.osnetwork>
  21. Date: Tue Aug 31 15:11:26 2010 -0700
  22.  
  23. Revert "Added a note to README about needing apt-pinning on fresh Debian install to get python2.6-dev"
  24. Two commits solve the same problem, one by me (this one) and one by the orig maintainer
  25.  
  26. This reverts commit 7fd80ab62d7393be25193e0317936c5ca483f5e0.
  27.  
  28. commit e891c6892c331b76040154c00e2114e432408982
  29. Author: Jeff Welling <Jeff.Welling@Gmail.com>
  30. Date: Tue Aug 31 15:03:26 2010 -0700
  31.  
  32. Changed launchpadlib to not require version 1.5.3
  33.  
  34. commit 09c0d24921f1a8a4638656b782450762fbee84d9
  35. Author: Asheesh Laroia <asheesh@asheesh.org>
  36. Date: Tue Aug 31 10:15:27 2010 -0400
  37.  
  38. Updates to README talking about Python 2.6
  39.  
  40. Really, use Python 2.6.
  41.  
  42. commit bf83f5cab755dfdace14020d5004f411efe40347
  43. Author: Jeff Welling <Jeff.Welling@Gmail.com>
  44. Date: Tue Aug 31 03:22:57 2010 -0700
  45.  
  46. Added a note to README about needing apt-pinning on fresh Debian install to get python2.6-dev
  47.  
  48. commit fd1668222548425436c5d7af329ef0712d0d28ec
  49. Author: Asheesh Laroia <asheesh@asheesh.org>
  50. Date: Thu Aug 26 11:43:19 2010 -0400
  51.  
  52. On project pages: "Contributors" => "Registered contributors"
  53.  
  54. Thanks to tonfa of Mercurial for this suggestion.
  55.  
  56. commit c1d0e69d3dc69c013981f190f83c527f2cbfdf14
  57. karen@laesa:~/Code/milestone-a$ export EDITOR=gedit
  58. karen@laesa:~/Code/milestone-a$ git rebase -i origin/next
  59. Interactive rebase already started
  60. karen@laesa:~/Code/milestone-a$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement