Skip to content

Instantly share code, notes, and snippets.

@dabrahams
Created January 4, 2009 22:46
Show Gist options
  • Save dabrahams/43202 to your computer and use it in GitHub Desktop.
Save dabrahams/43202 to your computer and use it in GitHub Desktop.
Rebasing master onto 8b27d6f
11312dd8d801daf4c3300c46586ce0b41b31228b
repo: /home/dave/src/techarcana/.git
history scope: HEAD
Help
Common Key Bindings:
n:next thing p:previous thing /:search history s:show repo's status g:redisplay q:quit
Extra Key Bindings for a Commit line:
SPC:load details h:hide/show details H:hide sub-blocks o:checkout b:start new branch
a:anchor HEAD t:new tag T:new annotated tag m:merge to HEAD r:rebase HEAD B:create branch
Extra Key Bindings to prepare a (interactive) rebase:
+:mark as picked .:mark as squashed ~:mark as edited -:unmark
Extra Extra Key Bindings for a Ref:
x:delete ref u:update another local ref U:upload to remote d:download
Extra Key Bindings for a Diff Block:
RET:visit version/line
References:
local-branch lightweight-tag annotated-tag remote/branch
* --------------------------- 11312dd8 Move some global configuration into config.d/
* --------------------------- 8b27d6fa reconstruct submodules
* --------------------------- ef859ec9 Rename packages.d => package.d
* --------------------------- 47752c8f Temporarily make things work again so I can start a new emacs session
* --------------------------- b0ed0238 Moving packages to packages.d
* --------------------------- 83c737e8 Migrating packages to packages.d and autoloads to autoloads.d
* - origin/master origin/HEAD f8969468 Got muse, planner, and remember in the repo as proper submodules
* --------------------------- 2d99c347 Added egg package
* --------------------------- 1fb3557f Initial commit, migrating BoostPro svn
* --------------------------- bfd0db34 Add a tiny bit of content
* --------------------------- fa6e48fc first commit
history of HEAD
repo: /home/dave/src/techarcana/.git
Help
Common Key Bindings:
n:next thing p:previous thing s:show repo's status g:redisplay q:quit
Extra Key Bindings for a Commit line:
RET:locate commit in history SPC:load details h:hide/show details H:hide sub-blocks
a:anchor HEAD o:checkout b:start new branch B:create branch
t:new tag T:new annotated tag m:merge to HEAD r:rebase HEAD
Extra Key Bindings for a Diff Block:
RET:visit version/line
--------------------------- 11312dd8 HEAD@{0}: commit:
--------------------------- 8b27d6fa HEAD@{1}: checkout: moving from master to 8b27d6f
-------------------- master f2d16629 HEAD@{2}: rebase -i (pick): updating HEAD
--------------------------- 900e8c69 HEAD@{3}: rebase -i (pick): updating HEAD
--------------------------- 565d261d HEAD@{4}: rebase -i (pick): updating HEAD
--------------------------- ab3b1845 HEAD@{5}: rebase -i (pick): updating HEAD
--------------------------- 8b27d6fa HEAD@{6}: checkout: moving from master to 8b27d6fa8588f7df23b169a70225a57fa29ead01
-------------------- master f2d16629 HEAD@{7}: commit: Bring in mailcrypt so I can deinstall emacs-snapshot and all the crazy
--------------------------- 900e8c69 HEAD@{8}: rebase -i (squash): updating HEAD
--------------------------- c9626429 HEAD@{9}: rebase -i (pick): updating HEAD
--------------------------- 900e8c69 HEAD@{10}: checkout: moving from master to 900e8c69c363d531763e819308c3082658371a4a
--------------------------- 02b5c218 HEAD@{11}: commit:
--------------------------- c9626429 HEAD@{12}: commit:
--------------------------- 900e8c69 HEAD@{13}: commit: Move some always-needed emacs config back to config.d/
--------------------------- 565d261d HEAD@{14}: commit:
--------------------------- ab3b1845 HEAD@{15}: commit:
--------------------------- 8b27d6fa HEAD@{16}: commit: reconstruct submodules
--------------------------- ef859ec9 HEAD@{17}: commit: Rename packages.d => package.d
--------------------------- 47752c8f HEAD@{18}: commit: Temporarily make things work again so I can start a new emacs session
--------------------------- b0ed0238 HEAD@{19}: commit: Moving packages to packages.d
--------------------------- 83c737e8 HEAD@{20}: commit: Migrating packages to packages.d and autoloads to autoloads.d
- origin/master origin/HEAD f8969468 HEAD@{21}: commit: Got muse, planner, and remember in the repo as proper submodules
--------------------------- 2d99c347 HEAD@{22}: pull : Fast forward
--------------------------- 1fb3557f HEAD@{23}: clone: from [email protected]:boostpro/techarcana.git
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment