Created
May 24, 2012 19:10
-
-
Save filler/2783603 to your computer and use it in GitHub Desktop.
no submodules
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
| silkey@dhcp-128-36-249-126:~> cd /tmp | |
| silkey@dhcp-128-36-249-126:/tmp> git clone --recursive git://git.yale.edu/drupal/drupal.git | |
| Cloning into 'drupal'... | |
| remote: Counting objects: 112003, done. | |
| remote: Compressing objects: 100% (23297/23297), done. | |
| remote: Total 112003 (delta 82539), reused 111838 (delta 82377) | |
| Receiving objects: 100% (112003/112003), 39.50 MiB | 8.37 MiB/s, done. | |
| Resolving deltas: 100% (82539/82539), done. | |
| Submodule 'sites/all/modules/contrib/cas' (git://git.drupal.org/project/cas.git) registered for path 'sites/all/modules/contrib/cas' | |
| Cloning into 'sites/all/modules/contrib/cas'... | |
| remote: Counting objects: 1436, done. | |
| remote: Compressing objects: 100% (1088/1088), done. | |
| remote: Total 1436 (delta 947), reused 570 (delta 345) | |
| Receiving objects: 100% (1436/1436), 478.25 KiB | 201 KiB/s, done. | |
| Resolving deltas: 100% (947/947), done. | |
| Submodule path 'sites/all/modules/contrib/cas': checked out '099959cfe2ed6d04b31b74c70a6e994dc99eb6e9' | |
| silkey@dhcp-128-36-249-126:/tmp> cd drupal | |
| silkey@dhcp-128-36-249-126:/tmp/drupal(master)> git ls-remote git://git.drupal.org/project/views.git | |
| 8beebb55aa9e9895052a2cab97da3407afae5548 HEAD | |
| 7a10b5c3262870ba8751d2c04183ed3aa4d47b7f refs/heads/4.6.x-1.x | |
| 0d9a1ca7263afc96519492abdb679c1866f16f14 refs/heads/4.7.x-1.x | |
| 8039a536511d1e761e371e03f9aec7d0620ad6f8 refs/heads/5.x-1.x | |
| e5b9c5077eae776da5c7719538c8ab4d9d69bf26 refs/heads/6.x-2.11-security | |
| 402eed8905bf3542f7ec359c01a1631053f39d32 refs/heads/6.x-2.x | |
| df533ec682992ca05444730235b25a42ba6c233f refs/heads/6.x-3.x | |
| ad1a8ea8f0fe7b3cdbb0ff669ee85f1d146048df refs/heads/7.x-3.x | |
| 88de1d8464f30268d3af10b984934798c6ee09bc refs/heads/8.x-3.x | |
| be9b7bff6e7b228c1c297149380def6e0cc2c61f refs/heads/d7v3ui | |
| 8beebb55aa9e9895052a2cab97da3407afae5548 refs/heads/master | |
| 7d554351ce81f1e5be8b5fffd75f572a8f152070 refs/tags/4-7--1-4-2 | |
| 6cfbd76ef1c60751dc20a6524c3e1852a2192fdc refs/tags/4.7.x-1.0 | |
| 5b7129ff018b2d7565e234b9385002875e0b9e11 refs/tags/4.7.x-1.1 | |
| 27eb01bac74956871a7da5a981e517e4043be046 refs/tags/4.7.x-1.2 | |
| c7c6368ed300212fd57fed60d10b1237172c9f51 refs/tags/4.7.x-1.3 | |
| c53c9eceea10f9f4a27b73e039c5f9e44701fcce refs/tags/4.7.x-1.4 | |
| 5f145a6c29cccb32354675d6dfeb56d61af3d719 refs/tags/4.7.x-1.5 | |
| 1239940750a22bbff5cdb1c19110265ba32d6ed6 refs/tags/4.7.x-1.6 | |
| f7beb48399bf976bcc0fda57a6fe1e859c4c59d4 refs/tags/4.7.x-1.6-beta | |
| d7ae8e6bf2c8b05713c812bb6f673868d76adc50 refs/tags/4.7.x-1.6-beta2 | |
| c9b7712d1a13cf7e6baced79d541eb8ef8850db7 refs/tags/4.7.x-1.6-beta3 | |
| 49250452814ca830d1312fe3f1de2dd49dbe3675 refs/tags/4.7.x-1.6-beta5 | |
| d961ae4ce947ac94aaefc819f8e00ff9f5ef129d refs/tags/5.x-1.0 | |
| df5ce84af99c2ba29b1adb2f6647fed80271a9c4 refs/tags/5.x-1.1-beta | |
| 24ef1514f8be1492d16c4b0678ecef62f82f4a24 refs/tags/5.x-1.2-beta1 | |
| 0f04e0d742d50458397128bb97e7b2b3b3f65633 refs/tags/5.x-1.3-beta1 | |
| c53c9eceea10f9f4a27b73e039c5f9e44701fcce refs/tags/5.x-1.4-rc1 | |
| f505d7d59d6b5142c5674145cfd1487d8499ce32 refs/tags/5.x-1.5 | |
| 73d93c143c312149da6b1ffcc4b65a7daed00ad4 refs/tags/5.x-1.6 | |
| f7898ee041633cc532198a042c121d45963923e3 refs/tags/5.x-1.6-beta | |
| 8ec08ecfa7644c10d3ecd39c1e6f384e73769662 refs/tags/5.x-1.6-beta2 | |
| 76a4c555b501f02da7d15290e816af30a180ecf2 refs/tags/5.x-1.6-beta3 | |
| e6a3110f5b0f640eb91207ac25afe4d4c1a8e4ea refs/tags/5.x-1.6-beta4 | |
| 746bd03bda60f9321bd4c434088413272b9547b5 refs/tags/5.x-1.6-beta5 | |
| b2440ed3beb0e56c6ce3c7503c118bdfcefb2599 refs/tags/5.x-1.7 | |
| 7fe9f66275088f61543e0d49561eb87f5fa1585f refs/tags/5.x-1.8 | |
| 64a2a4453b182ee47dca89dec57d372927d617ab refs/tags/6.x-2.0 | |
| 26d4e696937b834ed8985aba1b5c592068fcc4c9 refs/tags/6.x-2.0-alpha1 | |
| 07bd18b0e98491ce80829f37f213836edbe9a9d1 refs/tags/6.x-2.0-alpha2 | |
| c12fe49d07bd09824f1d40f0b43cf183d9fbb978 refs/tags/6.x-2.0-alpha3 | |
| 9a10f2b1c33edaf9643d9a781cf20e1329907745 refs/tags/6.x-2.0-alpha4 | |
| fc5927b1b2d93505ad646d24f0527b905dae2c0c refs/tags/6.x-2.0-alpha5 | |
| c0899b62833d40f58e953777263f9bb24d8f0e09 refs/tags/6.x-2.0-beta1 | |
| c44188ce6f0065c6f06fe69c33989c1c37a48aa0 refs/tags/6.x-2.0-beta2 | |
| 59342bad92c384688d880c4975a361eacec3e206 refs/tags/6.x-2.0-beta3 | |
| c6a746c056b9005ae8115d7279ad4cee838d6f64 refs/tags/6.x-2.0-beta4 | |
| 065e1968274dc92b57beb5111568c0be0f208934 refs/tags/6.x-2.0-rc1 | |
| 3272a8c28dbece4fd48473440abe90f4124c264e refs/tags/6.x-2.0-rc2 | |
| 94ce9d21a7825ddfc6de0121a600a30b8b1aa536 refs/tags/6.x-2.0-rc3 | |
| 74274a93ca6984a78b87c990de12e745178395a4 refs/tags/6.x-2.0-rc4 | |
| 7e4674c3371a7930007e996ebdf7bd4c1e9a0f7f refs/tags/6.x-2.0-rc5 | |
| dfa5055b2092c76ba4f1b60f3a57cb106adb7197 refs/tags/6.x-2.1 | |
| 9d28966f1b754cc352d17d86c107d8343e74b98a refs/tags/6.x-2.10 | |
| 755ac789c66875ff7a468551dd4707c04959c22a refs/tags/6.x-2.11 | |
| 42fe4029ca7d7410f15933032a17e979bb0957c4 refs/tags/6.x-2.12 | |
| ff9727eb6e30937a04ddbad83badf22540f59205 refs/tags/6.x-2.13 | |
| 076e78e4270a16d5e699de329dfc9964a53ebf94 refs/tags/6.x-2.14 | |
| 80f38fe2fb66193814592663da06d04ba1f3ba19 refs/tags/6.x-2.15 | |
| 049f173d91b7ac0f659110ca2b394580812ec1cd refs/tags/6.x-2.16 | |
| 61ffc1b82515b49066fbf7884df8c7a05c72671d refs/tags/6.x-2.2 | |
| 5b9464918996ea1a7d223b809115043236cb5a30 refs/tags/6.x-2.3 | |
| 5cb0a30ec6f6577078a91389fcf1a5064a40fa3b refs/tags/6.x-2.4 | |
| 87e2c0596a97522dd8a5f77aa48e42ab81c7f665 refs/tags/6.x-2.5 | |
| Welcome to Views 3. Please see the advanced help for more information. | |
| c7e8b287b04a71728536dd2f52f826f2560af777 refs/tags/6.x-2.6 | |
| 04e8645be02512f63476b98890ebdc211a4cdab6 refs/tags/6.x-2.7 | |
| 54bd892f63aefa247d1fd435b92a2c889dab4857 refs/tags/6.x-2.8 | |
| 510075bdc05cf8e36df141d39a438627bfed43bc refs/tags/6.x-2.9 | |
| 1ce00ae733bb6f0b7e22fd55c02dc5ece687d77e refs/tags/6.x-3.0 | |
| 48c38e98710d75799afce8b54db73b3b5490c77a refs/tags/6.x-3.0-alpha1 | |
| 3caf94091afc81dd5391109e3348f07764764013 refs/tags/6.x-3.0-alpha2 | |
| 2d1893416e574c6ae8b36cd7ec61357f3ad5841c refs/tags/6.x-3.0-alpha3 | |
| 63a9cc63bbcf2834e0c3ad565a9d477f732e4959 refs/tags/6.x-3.0-alpha4 | |
| db50cdc367b3c8d610aea8debf4bda96429883b6 refs/tags/6.x-3.0-rc1 | |
| 984e54c7078139adca3f0406367e17f02d423dcc refs/tags/6.x-3.0-rc2 | |
| 50247e152a7823f55038e1fedb0fe711f4e82ff9 refs/tags/6.x-3.0-rc3 | |
| db50cdc367b3c8d610aea8debf4bda96429883b6 refs/tags/6.x-3.x-RC1 | |
| Merge tag '7.x-3.3' of git://git.drupal.org/project/views | |
| bc5a754537fb5ad9d58569af4601374f5ff6c0f2 refs/tags/7.x-3.0 | |
| 9f13696b0f65be5c9cb67666ea41327b7b21c665 refs/tags/7.x-3.0-alpha1 | |
| 08d87a0693b422e34db948ac51df2dda43b64139 refs/tags/7.x-3.0-beta1 | |
| 9728052aa364729049a43d935b9faf192594710c refs/tags/7.x-3.0-beta2 | |
| 43827b0866b2e832c634675d1a9a6a14c70628c6 refs/tags/7.x-3.0-beta3 | |
| 481cec026c826b19b45e3555fe8e50f31defb6fe refs/tags/7.x-3.0-rc1 | |
| 4112984910e00e9f193f30cfa6488d119a66cc5f refs/tags/7.x-3.0-rc2 | |
| b50d67c3294ba21acd47e03d4fa5d581c3c6851b refs/tags/7.x-3.0-rc3 | |
| 0c4c07f9ef558127f91cd4ac98fa92a3df4f728b refs/tags/7.x-3.1 | |
| 38bbb5441a8db5ad3b75006c0a64ae4515229cc7 refs/tags/7.x-3.2 | |
| 423bc82111925528f00838bd200220663319c293 refs/tags/7.x-3.3 | |
| 6de73740ffcb2695c940fef566f1f15883091ae6 refs/tags/DRUPAL-5--1-4-2-RC1 | |
| silkey@dhcp-128-36-249-126:/tmp/drupal(master)> git clone git://git.drupal.org/project/views.git sites/all/modules/contrib/views | |
| Cloning into 'sites/all/modules/contrib/views'... | |
| remote: Counting objects: 37165, done. | |
| remote: Compressing objects: 100% (11405/11405), done. | |
| remote: Total 37165 (delta 28928), reused 33699 (delta 25600) | |
| Receiving objects: 100% (37165/37165), 12.76 MiB | 720 KiB/s, done. | |
| Resolving deltas: 100% (28928/28928), done. | |
| silkey@dhcp-128-36-249-126:/tmp/drupal(master)> git add sites/all/modules/contrib/views/ | |
| silkey@dhcp-128-36-249-126:/tmp/drupal(master)> cd sites/all/modules/contrib/views | |
| silkey@dhcp-128-36-249-126:/tmp/drupal/sites/all/modules/contrib/views(master)> git pull origin 7.x-3.2 | |
| From git://git.drupal.org/project/views | |
| * tag 7.x-3.2 -> FETCH_HEAD | |
| Auto-merging README.txt | |
| CONFLICT (add/add): Merge conflict in README.txt | |
| Automatic merge failed; fix conflicts and then commit the result. | |
| silkey@dhcp-128-36-249-126:/tmp/drupal/sites/all/modules/contrib/views(master)> vim README.txt | |
| silkey@dhcp-128-36-249-126:/tmp/drupal/sites/all/modules/contrib/views(master)> git add README.txt | |
| silkey@dhcp-128-36-249-126:/tmp/drupal/sites/all/modules/contrib/views(master)> git ci -m'pull in views 7.x-3.2' | |
| [master 993adf9] pull in views 7.x-3.2 | |
| silkey@dhcp-128-36-249-126:/tmp/drupal/sites/all/modules/contrib/views(master)> git pull origin views-7.x-3.3 | |
| fatal: Couldn't find remote ref views-7.x-3.3 | |
| silkey@dhcp-128-36-249-126:/tmp/drupal/sites/all/modules/contrib/views(master)> git remote -v | |
| origin git://git.drupal.org/project/views.git (fetch) | |
| origin git://git.drupal.org/project/views.git (push) | |
| silkey@dhcp-128-36-249-126:/tmp/drupal/sites/all/modules/contrib/views(master)> git pull origin 7.x-3.3 | |
| From git://git.drupal.org/project/views | |
| * tag 7.x-3.3 -> FETCH_HEAD | |
| Merge made by the 'recursive' strategy. | |
| handlers/views_handler_field.inc | 1 + | |
| handlers/views_handler_field_contextual_links.inc | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | |
| modules/field/views_handler_field_field.inc | 2 +- | |
| modules/views.views.inc | 10 ++++++++++ | |
| plugins/views_plugin_style.inc | 17 ++++++++--------- | |
| theme/theme.inc | 49 ++++++++++++++++++++++++++----------------------- | |
| views.info | 1 + | |
| views.module | 4 ++++ | |
| 8 files changed, 138 insertions(+), 33 deletions(-) | |
| create mode 100644 handlers/views_handler_field_contextual_links.inc | |
| silkey@dhcp-128-36-249-126:/tmp/drupal/sites/all/modules/contrib/views(master)> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment