Last active
April 7, 2016 08:38
-
-
Save akrabat/9ddef54ab499fdf7245f9ef3a6c7c750 to your computer and use it in GitHub Desktop.
1. git log --oneline --decorate --all --graph, 2. git rebase -i -p upstream/gh-pages
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| rob@swiftsure /www/oss/Slim-Website (gh-pages)$ git log --oneline --decorate --all --graph | |
| * 1b65ada (HEAD -> gh-pages, origin/gh-pages, origin/HEAD) Merge pull request #137 from zmip/patch-1 | |
| |\ | |
| | * e87a3fc Expanded and corrected doc on PSR7 URI object | |
| * | 83c6906 Merge pull request #138 from jsmrls/patch-1 | |
| |\ \ | |
| | * | 0d35b77 Make example redirection temporary instead of permanent | |
| |/ / | |
| * | 9a7a90a Merge pull request #136 from tflight/patch-1 | |
| |\ \ | |
| | * | 73eedf8 Add period at end of sentence and paragraph break. | |
| | * | e838ddb Fix method name typos. | |
| |/ / | |
| * | 5bc5d36 Merge branch 'geggleto-gh-pages' into gh-pages | |
| |\ \ | |
| | * | fe3866a (geggleto-gh-pages) Minor clean up | |
| | * | 4536fec Fix link to Container Resolution section | |
| | * | f1ef86c (geggleto/gh-pages) Fix Typo | |
| | * | 70aa723 Update | |
| | * | 0df5dcc Adding section on Resolving Callables and how to use them | |
| | * | 6125c25 Merge pull request #9 from slimphp/gh-pages | |
| | |\ \ | |
| | | |/ | |
| * | | a7cc37b Merge branch 'milesich-patch-1' into gh-pages | |
| |\ \ \ | |
| | * | | a8536ec (milesich/patch-1, milesich-patch-1) fix to call correct method name | |
| | | |/ | |
| | |/| | |
| * | | 43f36fe Include ZF EventManager as an option too | |
| * | | 15114cf clarify notes on removal of hooks | |
| * | | e95bd0e Merge pull request #135 from lesmo/patch-1 | |
| |\ \ \ | |
| | |/ / | |
| |/| | | |
| | * | aac623a Update templates.md | |
| |/ / | |
| | | * 5091394 (alexweissman-gh-pages) Include ZF EventManager as an option too | |
| | | * 441a066 (alexweissman/gh-pages) clarify notes on removal of hooks | |
| | |/ | |
| |/| | |
| * | 63e3b95 Merge branch 'svpernova09-add-database-orm' into gh-pages | |
| |\ \ | |
| | * | 3c2aeb5 (svpernova09-add-database-orm) Change title to Using Eloquent with Slim | |
| | * | bcbf8e8 Tidy formatting | |
| | * | 81405b5 (svpernova09/add-database-orm) incorporate feedback from geggleto, tweak variable names, add reference to settings array | |
| | * | dab324c Add cookbook entry for Database ORM / Eloquent usage | |
| |/ / | |
| * | 9a7cc19 Merge pull request #130 from atomiix/patch-1 | |
| |\ \ | |
| | * | f38c969 Update router.md | |
| |/ / | |
| * | d1e9d5f Merge pull request #129 from mathmarques/patch-3 | |
| |\ \ | |
| | * | 723064e Small fix | |
| |/ / | |
| * | 6b30ddc Add menu item for Slim Default Settings | |
| * | 6f9a18d Merge branch 'JoshWillik-application-docs' into gh-pages | |
| |\ \ | |
| | * | cc703f1 (JoshWillik-application-docs) Flesh out application documentation page | |
| | * | 9659a46 (JoshWillik/application-docs) Add brief Application information | |
| * | | efb1d13 Document how to implement 'unlimited' segments in router | |
| |/ / | |
| * | 2f0785b Add information about optional route segments | |
| * | d1bee19 Merge pull request #121 from Rotzbua/patch-1 | |
| |\ \ | |
| | * | dd7aedc Update retrieving-current-route.md | |
| * | | a6576e8 Merge pull request #127 from jimigrunge/patch-1 | |
| |\ \ \ | |
| | * | | 454b378 Update first-app.md to fix typos | |
| |/ / / | |
| * | | 60cc887 Update menu bar support link | |
| * | | 2c07b97 (discourse) Update nav support link | |
| | | | * d90d6e3 (upstream/gh-pages) Update nav support link | |
| | |_|/ | |
| |/| | | |
| * | | 61dd1f9 Add new images | |
| * | | 2e0485d Merge pull request #125 from robertprice/gh-pages | |
| |\ \ \ | |
| | * | | e74ebd2 Example documentation for the withJson() method | |
| |/ / / | |
| * | | e088d74 Merge branch 'ppetermann-patch-1' into gh-pages | |
| |\ \ \ | |
| | * | | f2f7362 (ppetermann/patch-1, ppetermann-patch-1) fixes for var_export usage | |
| |/ / / | |
| * | | f9946c4 Add blog post about First Walkthrough Tutorial | |
| * | | e2c15d0 Merge branch 'lornajane-first-slim-app-tutorial' into gh-pages | |
| |\ \ \ | |
| | * | | b718333 (lornajane-first-slim-app-tutorial) Shorter title for left hand menu | |
| | * | | bf55bfe (lornajane/first-slim-app-tutorial) Update location of example code | |
| | * | | edeaaa5 Add a new tutorial section in the nav and link to walkthrough tutorial | |
| | * | | a97130f Add the walkthrough tutorial to a new tutorial section | |
| |/ / / | |
| * | | ddd6d5c Blog post on 3.3.0 | |
| |/ / | |
| * | e711311 Merge branch 'gh-pages' of github.com:slimphp/Slim-Website into gh-pages | |
| |\ \ | |
| | * \ 64d8d2f Merge pull request #119 from cristiammercado/patch-1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| rob@swiftsure /www/oss/Slim-Website (gh-pages)$ git --no-pager log --oneline --decorate --all --graph | |
| * ee32107 (HEAD -> gh-pages) Merge pull request #137 from zmip/patch-1 | |
| |\ | |
| | * deffa07 Expanded and corrected doc on PSR7 URI object | |
| * | f5ff452 Merge pull request #138 from jsmrls/patch-1 | |
| |\ \ | |
| | * | b264892 Make example redirection temporary instead of permanent | |
| |/ / | |
| * | 91047ab Merge pull request #136 from tflight/patch-1 | |
| |\ \ | |
| | * | 23fb546 Add period at end of sentence and paragraph break. | |
| | * | b32d225 Fix method name typos. | |
| |/ / | |
| * | 7bdfd10 Merge branch 'geggleto-gh-pages' into gh-pages | |
| |\ \ | |
| | * | 46b547f Minor clean up | |
| | * | 089a0fc Fix link to Container Resolution section | |
| | * | f8cbb01 Fix Typo | |
| | * | b4ee68d Update | |
| | * | 048f6ef Adding section on Resolving Callables and how to use them | |
| | * | 710f18e Merge pull request #9 from slimphp/gh-pages | |
| | |\ \ | |
| | | |/ | |
| * | | d8416fc Merge branch 'milesich-patch-1' into gh-pages | |
| |\ \ \ | |
| | * | | a2aa3aa fix to call correct method name | |
| | | |/ | |
| | |/| | |
| * | | 56ecdc6 Include ZF EventManager as an option too | |
| * | | 24c6a8d clarify notes on removal of hooks | |
| * | | 86a079f Merge pull request #135 from lesmo/patch-1 | |
| |\ \ \ | |
| | |/ / | |
| |/| | | |
| | * | 24b8924 Update templates.md | |
| |/ / | |
| * | 5428155 Merge branch 'svpernova09-add-database-orm' into gh-pages | |
| |\ \ | |
| | * | 11b8949 Change title to Using Eloquent with Slim | |
| | * | 6cbc2b3 Tidy formatting | |
| | * | 43e5e45 incorporate feedback from geggleto, tweak variable names, add reference to settings array | |
| | * | c4d7a62 Add cookbook entry for Database ORM / Eloquent usage | |
| |/ / | |
| * | fb98c8e Merge pull request #130 from atomiix/patch-1 | |
| |\ \ | |
| | * | 53c1565 Update router.md | |
| |/ / | |
| * | 43f1020 Merge pull request #129 from mathmarques/patch-3 | |
| |\ \ | |
| | * | 51670bd Small fix | |
| |/ / | |
| * | 7c58062 Add menu item for Slim Default Settings | |
| * | 3744959 Merge branch 'JoshWillik-application-docs' into gh-pages | |
| |\ \ | |
| | * | 2e2330c Flesh out application documentation page | |
| | * | 4e212ab Add brief Application information | |
| * | | 250af9a Document how to implement 'unlimited' segments in router | |
| |/ / | |
| * | 1d063fe Add information about optional route segments | |
| * | 82fc2e9 Merge pull request #121 from Rotzbua/patch-1 | |
| |\ \ | |
| * \ \ afc2fd4 Merge pull request #127 from jimigrunge/patch-1 | |
| |\ \ \ | |
| | * | | 6bc93d7 Update first-app.md to fix typos | |
| |/ / / | |
| * | | 62cc0ca Update menu bar support link | |
| * | | d90d6e3 (upstream/gh-pages) Update nav support link | |
| | | | * 1b65ada (origin/gh-pages, origin/HEAD) Merge pull request #137 from zmip/patch-1 | |
| | | | |\ | |
| | | | | * e87a3fc Expanded and corrected doc on PSR7 URI object | |
| | | | * | 83c6906 Merge pull request #138 from jsmrls/patch-1 | |
| | | | |\ \ | |
| | | | | * | 0d35b77 Make example redirection temporary instead of permanent | |
| | | | |/ / | |
| | | | * | 9a7a90a Merge pull request #136 from tflight/patch-1 | |
| | | | |\ \ | |
| | | | | * | 73eedf8 Add period at end of sentence and paragraph break. | |
| | | | | * | e838ddb Fix method name typos. | |
| | | | |/ / | |
| | | | * | 5bc5d36 Merge branch 'geggleto-gh-pages' into gh-pages | |
| | | | |\ \ | |
| | | | | * | fe3866a (geggleto-gh-pages) Minor clean up | |
| | | | | * | 4536fec Fix link to Container Resolution section | |
| | | | | * | f1ef86c (geggleto/gh-pages) Fix Typo | |
| | | | | * | 70aa723 Update | |
| | | | | * | 0df5dcc Adding section on Resolving Callables and how to use them | |
| | | | | * | 6125c25 Merge pull request #9 from slimphp/gh-pages | |
| | | | | |\ \ | |
| | | | |/ / / | |
| | | |/| | / | |
| | | | | |/ | |
| | | | * | a7cc37b Merge branch 'milesich-patch-1' into gh-pages | |
| | | | |\ \ | |
| | | | | * | a8536ec (milesich/patch-1, milesich-patch-1) fix to call correct method name | |
| | | | | |/ | |
| | | | * | 43f36fe Include ZF EventManager as an option too | |
| | | | * | 15114cf clarify notes on removal of hooks | |
| | | | * | e95bd0e Merge pull request #135 from lesmo/patch-1 | |
| | | | |\ \ | |
| | | | | |/ | |
| | | | |/| | |
| | | | | * aac623a Update templates.md | |
| | | | |/ | |
| | | | | * 5091394 (alexweissman-gh-pages) Include ZF EventManager as an option too | |
| | | | | * 441a066 (alexweissman/gh-pages) clarify notes on removal of hooks | |
| | | | |/ | |
| | | | * 63e3b95 Merge branch 'svpernova09-add-database-orm' into gh-pages | |
| | | | |\ | |
| | | | | * 3c2aeb5 (svpernova09-add-database-orm) Change title to Using Eloquent with Slim | |
| | | | | * bcbf8e8 Tidy formatting | |
| | | | | * 81405b5 (svpernova09/add-database-orm) incorporate feedback from geggleto, tweak variable names, add reference to settings array | |
| | | | | * dab324c Add cookbook entry for Database ORM / Eloquent usage | |
| | | | |/ | |
| | | | * 9a7cc19 Merge pull request #130 from atomiix/patch-1 | |
| | | | |\ | |
| | | | | * f38c969 Update router.md | |
| | | | |/ | |
| | | | * d1e9d5f Merge pull request #129 from mathmarques/patch-3 | |
| | | | |\ | |
| | | | | * 723064e Small fix | |
| | | | |/ | |
| | | | * 6b30ddc Add menu item for Slim Default Settings | |
| | | | * 6f9a18d Merge branch 'JoshWillik-application-docs' into gh-pages | |
| | | | |\ | |
| | | | | * cc703f1 (JoshWillik-application-docs) Flesh out application documentation page | |
| | | | | * 9659a46 (JoshWillik/application-docs) Add brief Application information | |
| | | | * | efb1d13 Document how to implement 'unlimited' segments in router | |
| | | | |/ | |
| | | | * 2f0785b Add information about optional route segments | |
| | | | * d1bee19 Merge pull request #121 from Rotzbua/patch-1 | |
| | | | |\ | |
| | | |_|/ | |
| | |/| | | |
| | * | | dd7aedc Update retrieving-current-route.md | |
| | | | * a6576e8 Merge pull request #127 from jimigrunge/patch-1 | |
| | | | |\ | |
| | | | | * 454b378 Update first-app.md to fix typos | |
| | | | |/ | |
| | | | * 60cc887 Update menu bar support link | |
| | | | * 2c07b97 (discourse) Update nav support link | |
| | |_|/ | |
| |/| | | |
| * | | 61dd1f9 Add new images | |
| * | | 2e0485d Merge pull request #125 from robertprice/gh-pages | |
| |\ \ \ | |
| | * | | e74ebd2 Example documentation for the withJson() method | |
| |/ / / | |
| * | | e088d74 Merge branch 'ppetermann-patch-1' into gh-pages | |
| |\ \ \ | |
| | * | | f2f7362 (ppetermann/patch-1, ppetermann-patch-1) fixes for var_export usage | |
| |/ / / | |
| * | | f9946c4 Add blog post about First Walkthrough Tutorial | |
| * | | e2c15d0 Merge branch 'lornajane-first-slim-app-tutorial' into gh-pages | |
| |\ \ \ | |
| | * | | b718333 (lornajane-first-slim-app-tutorial) Shorter title for left hand menu | |
| | * | | bf55bfe (lornajane/first-slim-app-tutorial) Update location of example code | |
| | * | | edeaaa5 Add a new tutorial section in the nav and link to walkthrough tutorial | |
| | * | | a97130f Add the walkthrough tutorial to a new tutorial section | |
| |/ / / | |
| * | | ddd6d5c Blog post on 3.3.0 | |
| |/ / | |
| * | e711311 Merge branch 'gh-pages' of github.com:slimphp/Slim-Website into gh-pages | |
| |\ \ | |
| | * \ 64d8d2f Merge pull request #119 from cristiammercado/patch-1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment