/gist:e9c680f87342f276d612 Secret
Last active
August 29, 2015 14:19
Star
You must be signed in to star a gist
This file contains 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
| git clone <redacted url> | |
| Cloning into 'repo'... | |
| remote: Counting objects: 40292, done. | |
| remote: Compressing objects: 100% (13633/13633), done. | |
| remote: Total 40292 (delta 25600), reused 38929 (delta 24680) | |
| Receiving objects: 100% (40292/40292), 57.30 MiB | 6.38 MiB/s, done. | |
| Resolving deltas: 100% (25600/25600), done. | |
| Checking connectivity... done. | |
| git remote add upstream <upstream url> | |
| git fetch upstream | |
| remote: Counting objects: 78408, done. | |
| remote: Compressing objects: 100% (26591/26591), done. | |
| remote: Total 78142 (delta 50800), reused 73292 (delta 48115) | |
| Receiving objects: 100% (78142/78142), 228.73 MiB | 6.96 MiB/s, done. | |
| Resolving deltas: 100% (50800/50800), completed with 169 local objects. | |
| From ssh://upstream/ | |
| <snipped list of branches and tags from upstream> | |
| ryan@ryanmacbookpro ~/workspace/ops/repo | |
| $ git merge 1.12.0.1 1 ↵ master | |
| warning: Cannot merge binary files: bin/composer.phar (HEAD vs. 1.12.0.1) | |
| Auto-merging composer.lock | |
| CONFLICT (content): Merge conflict in composer.lock | |
| Auto-merging composer.json | |
| CONFLICT (content): Merge conflict in composer.json | |
| Auto-merging bin/composer.phar | |
| CONFLICT (content): Merge conflict in bin/composer.phar | |
| Auto-merging app/config/parameters_stage.yml | |
| Auto-merging app/config/parameters_qa.yml | |
| CONFLICT (modify/delete): app/config/parameters_gonzo.yml deleted in HEAD and modified in 1.12.0.1. Version 1.12.0.1 of app/config/parameters_gonzo.yml left in tree. | |
| CONFLICT (modify/delete): app/config/parameters_fozzie.yml deleted in HEAD and modified in 1.12.0.1. Version 1.12.0.1 of app/config/parameters_fozzie.yml left in tree. | |
| Auto-merging app/config/parameters_dev.yml | |
| Auto-merging app/config/base/doctrine.yml | |
| Auto-merging app/config/base/assetic.yml | |
| Automatic merge failed; fix conflicts and then commit the result. | |
| ryan@ryanmacbookpro ~/workspace/ops/repo | |
| $ gst 1 ↵ ═ ✚ master|MERGING | |
| On branch master | |
| Your branch is up-to-date with 'origin/master'. | |
| You have unmerged paths. | |
| (fix conflicts and run "git commit") | |
| Changes to be committed: | |
| new file: app/DoctrineMigrations/Version20150324144214.php | |
| modified: app/SymfonyRequirements.php | |
| modified: app/config/base/assetic.yml | |
| modified: app/config/base/doctrine.yml | |
| modified: app/config/parameters_dev.yml | |
| modified: app/config/parameters_qa.yml | |
| modified: app/config/parameters_stage.yml | |
| Unmerged paths: | |
| (use "git add/rm <file>..." as appropriate to mark resolution) | |
| deleted by us: app/config/parameters_fozzie.yml | |
| deleted by us: app/config/parameters_gonzo.yml | |
| both modified: bin/composer.phar | |
| both modified: composer.json | |
| both modified: composer.lock | |
| ryan@ryanmacbookpro ~/workspace/ops/repo | |
| $ git checkout --theirs composer.* bin/composer.phar ═ ✚ master|MERGING | |
| ryan@ryanmacbookpro ~/workspace/ops/repo | |
| $ git chekcout --theirs app/config/base/*.yml ═ ✚ master|MERGING | |
| WARNING: You called a Git command named 'chekcout', which does not exist. | |
| Continuing under the assumption that you meant 'checkout' | |
| Merge tag '1.12.0.1' | |
| in 0.1 seconds automatically... | |
| ryan@ryanmacbookpro ~/workspace/ops/repo | |
| $ gst ═ ✚ master|MERGING | |
| On branch master | |
| Your branch is up-to-date with 'origin/master'. | |
| You have unmerged paths. | |
| (fix conflicts and run "git commit") | |
| Changes to be committed: | |
| new file: app/DoctrineMigrations/Version20150324144214.php | |
| modified: app/SymfonyRequirements.php | |
| modified: app/config/base/assetic.yml | |
| modified: app/config/base/doctrine.yml | |
| modified: app/config/parameters_dev.yml | |
| modified: app/config/parameters_qa.yml | |
| modified: app/config/parameters_stage.yml | |
| Unmerged paths: | |
| (use "git add/rm <file>..." as appropriate to mark resolution) | |
| deleted by us: app/config/parameters_fozzie.yml | |
| deleted by us: app/config/parameters_gonzo.yml | |
| both modified: bin/composer.phar | |
| both modified: composer.json | |
| both modified: composer.lock | |
| ryan@ryanmacbookpro ~/workspace/ops/hub-sports | |
| $ git rm app/config/parameters_fozzie.yml app/config/parameters_gonzo.yml ═ ✚ master|MERGING | |
| app/config/parameters_fozzie.yml: needs merge | |
| app/config/parameters_gonzo.yml: needs merge | |
| rm 'app/config/parameters_fozzie.yml' | |
| rm 'app/config/parameters_gonzo.yml' | |
| ryan@ryanmacbookpro ~/workspace/ops/repo | |
| $ git add composer.* bin/composer.phar ═ ✚ master|MERGING | |
| ryan@ryanmacbookpro ~/workspace/ops/repo | |
| $ gc ✚ master|MERGING | |
| [master d1c0a90] Merge tag '1.12.0.1' | |
| ryan@ryanmacbookpro ~/workspace/ops/repo | |
| $ find . -name push_notifications.yml |
This file contains 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
| 1.10.0 | |
| 1.10.1 | |
| 1.10.3 | |
| 1.10.3.1 | |
| 1.10.3.10 | |
| 1.10.3.11 | |
| 1.10.3.12 | |
| 1.10.3.2 | |
| 1.10.3.3 | |
| 1.10.3.4 | |
| 1.10.3.5 | |
| 1.10.3.6 | |
| 1.10.3.7 | |
| 1.10.3.8 | |
| 1.10.3.9 | |
| 1.10.4 | |
| 1.10.5 | |
| 1.10.5.1 | |
| 1.10.5.2 | |
| 1.10.5.3 | |
| 1.10.5.5 | |
| 1.10.5.6 | |
| 1.10.5.7 | |
| 1.11.0 | |
| 1.11.0.1 | |
| 1.11.0.3 | |
| 1.11.1 | |
| 1.11.1.5 | |
| 1.11.1.6 | |
| 1.11.1.7 | |
| 1.11.2 | |
| 1.12.0 | |
| 1.12.0.1 | |
| 1.5.0 | |
| 1.5.1 | |
| 1.5.10 | |
| 1.5.11 | |
| 1.5.12 | |
| 1.5.13 | |
| 1.5.14 | |
| 1.5.15 | |
| 1.5.2 | |
| 1.5.3 | |
| 1.5.4 | |
| 1.5.5 | |
| 1.5.6 | |
| 1.5.7 | |
| 1.5.8 | |
| 1.5.9 | |
| 1.6.0 | |
| 1.6.1 | |
| 1.6.10 | |
| 1.6.11 | |
| 1.6.12 | |
| 1.6.13 | |
| 1.6.14 | |
| 1.6.15 | |
| 1.6.16 | |
| 1.6.17 | |
| 1.6.18 | |
| 1.6.19 | |
| 1.6.2 | |
| 1.6.20 | |
| 1.6.21 | |
| 1.6.22 | |
| 1.6.23 | |
| 1.6.24 | |
| 1.6.25 | |
| 1.6.26 | |
| 1.6.27 | |
| 1.6.28 | |
| 1.6.29 | |
| 1.6.3 | |
| 1.6.30 | |
| 1.6.31 | |
| 1.6.32 | |
| 1.6.33 | |
| 1.6.34 | |
| 1.6.35 | |
| 1.6.36 | |
| 1.6.37 | |
| 1.6.38 | |
| 1.6.39 | |
| 1.6.4 | |
| 1.6.40 | |
| 1.6.41 | |
| 1.6.42 | |
| 1.6.43 | |
| 1.6.44 | |
| 1.6.45 | |
| 1.6.46 | |
| 1.6.47 | |
| 1.6.48 | |
| 1.6.49 | |
| 1.6.5 | |
| 1.6.50 | |
| 1.6.51 | |
| 1.6.52 | |
| 1.6.53 | |
| 1.6.54 | |
| 1.6.55 | |
| 1.6.56 | |
| 1.6.57 | |
| 1.6.58 | |
| 1.6.59 | |
| 1.6.6 | |
| 1.6.60 | |
| 1.6.61 | |
| 1.6.62 | |
| 1.6.63 | |
| 1.6.64 | |
| 1.6.65 | |
| 1.6.66 | |
| 1.6.67 | |
| 1.6.68 | |
| 1.6.69 | |
| 1.6.7 | |
| 1.6.70 | |
| 1.6.71 | |
| 1.6.72 | |
| 1.6.73 | |
| 1.6.74 | |
| 1.6.75 | |
| 1.6.8 | |
| 1.6.9 | |
| 1.7.0 | |
| 1.7.1 | |
| 1.7.10 | |
| 1.7.10.1 | |
| 1.7.10.2 | |
| 1.7.11 | |
| 1.7.2 | |
| 1.7.3 | |
| 1.7.3.1 | |
| 1.7.3.2 | |
| 1.7.3.4 | |
| 1.7.4 | |
| 1.7.4.1 | |
| 1.7.4.10 | |
| 1.7.4.2 | |
| 1.7.4.3 | |
| 1.7.4.4 | |
| 1.7.4.5 | |
| 1.7.4.6 | |
| 1.7.4.7 | |
| 1.7.4.8 | |
| 1.7.4.9 | |
| 1.7.5 | |
| 1.7.5.1 | |
| 1.7.5.2 | |
| 1.7.5.3 | |
| 1.7.5.4 | |
| 1.7.5.5 | |
| 1.7.6 | |
| 1.7.7 | |
| 1.7.8 | |
| 1.7.9 | |
| 1.8.0 | |
| 1.8.1 | |
| 1.8.10 | |
| 1.8.11 | |
| 1.8.12 | |
| 1.8.2 | |
| 1.8.3 | |
| 1.8.4 | |
| 1.8.5 | |
| 1.8.6 | |
| 1.8.7 | |
| 1.8.7.1 | |
| 1.8.7.2 | |
| 1.8.7.3 | |
| 1.8.7.4 | |
| 1.8.8 | |
| 1.8.8.1 | |
| 1.8.8.2 | |
| 1.8.9 | |
| 1.8.9.1 | |
| 1.9.0 | |
| 1.9.1 | |
| show |
This file contains 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
| * master | |
| remotes/hub_standard/0.1 | |
| remotes/hub_standard/0.2 | |
| remotes/hub_standard/0.3 | |
| remotes/hub_standard/0.4 | |
| remotes/hub_standard/0.5 | |
| remotes/hub_standard/0.6 | |
| remotes/hub_standard/0.7 | |
| remotes/hub_standard/0.8 | |
| remotes/hub_standard/0.9 | |
| remotes/hub_standard/1.0 | |
| remotes/hub_standard/1.1 | |
| remotes/hub_standard/1.10 | |
| remotes/hub_standard/1.10.5.7-staging | |
| remotes/hub_standard/1.11 | |
| remotes/hub_standard/1.11-master | |
| remotes/hub_standard/1.11-to-master | |
| remotes/hub_standard/1.11.1-cnet | |
| remotes/hub_standard/1.11.1-rc1 | |
| remotes/hub_standard/1.11.1.5-staging | |
| remotes/hub_standard/1.11.1.7-staging | |
| remotes/hub_standard/1.11.2-rc | |
| remotes/hub_standard/1.11.2-to-1.11 | |
| remotes/hub_standard/1.12 | |
| remotes/hub_standard/1.2 | |
| remotes/hub_standard/1.3 | |
| remotes/hub_standard/1.4 | |
| remotes/hub_standard/1.5 | |
| remotes/hub_standard/1.6 | |
| remotes/hub_standard/1.7 | |
| remotes/hub_standard/1.8 | |
| remotes/hub_standard/1.9 | |
| remotes/hub_standard/HIDEV-773 | |
| remotes/hub_standard/OPSHUB-1691 | |
| remotes/hub_standard/OPSHUB-1893 | |
| remotes/hub_standard/OPSHUB-273-graphs-overhaul | |
| remotes/hub_standard/aliens | |
| remotes/hub_standard/almanac | |
| remotes/hub_standard/anchor | |
| remotes/hub_standard/annapurna | |
| remotes/hub_standard/article-review-refactor | |
| remotes/hub_standard/assetic | |
| remotes/hub_standard/atemps | |
| remotes/hub_standard/auddev | |
| remotes/hub_standard/bamboo | |
| remotes/hub_standard/belukha | |
| remotes/hub_standard/bladerunner | |
| remotes/hub_standard/blocker/hidev-260 | |
| remotes/hub_standard/boont | |
| remotes/hub_standard/bootstrap | |
| remotes/hub_standard/bug/HIDEV-1022 | |
| remotes/hub_standard/bug/HIDEV-1022-1.8 | |
| remotes/hub_standard/bug/HIDEV-1475 | |
| remotes/hub_standard/bug/HIDEV-1777-1.7 | |
| remotes/hub_standard/bug/HIDEV-2048-seamonkey | |
| remotes/hub_standard/bug/HIDEV-2786 | |
| remotes/hub_standard/bug/SYSOPS-2755 | |
| remotes/hub_standard/bug/hidev-106 | |
| remotes/hub_standard/bug/hidev-1085 | |
| remotes/hub_standard/bug/hidev-1104 | |
| remotes/hub_standard/bug/hidev-1104-1.7 | |
| remotes/hub_standard/bug/hidev-1123 | |
| remotes/hub_standard/bug/hidev-1124 | |
| remotes/hub_standard/bug/hidev-1124-1.7 | |
| remotes/hub_standard/bug/hidev-1181 | |
| remotes/hub_standard/bug/hidev-1271 | |
| remotes/hub_standard/bug/hidev-1289 | |
| remotes/hub_standard/bug/hidev-1308 | |
| remotes/hub_standard/bug/hidev-1317 | |
| remotes/hub_standard/bug/hidev-1378 | |
| remotes/hub_standard/bug/hidev-1382 | |
| remotes/hub_standard/bug/hidev-1455 | |
| remotes/hub_standard/bug/hidev-1463 | |
| remotes/hub_standard/bug/hidev-1463-enable | |
| remotes/hub_standard/bug/hidev-1464 | |
| remotes/hub_standard/bug/hidev-1487 | |
| remotes/hub_standard/bug/hidev-1503 | |
| remotes/hub_standard/bug/hidev-162 | |
| remotes/hub_standard/bug/hidev-1717-master | |
| remotes/hub_standard/bug/hidev-1744 | |
| remotes/hub_standard/bug/hidev-18 | |
| remotes/hub_standard/bug/hidev-1845 | |
| remotes/hub_standard/bug/hidev-1848 | |
| remotes/hub_standard/bug/hidev-1885-1.8 | |
| remotes/hub_standard/bug/hidev-1895 | |
| remotes/hub_standard/bug/hidev-1895-1.7 | |
| remotes/hub_standard/bug/hidev-1915-1.11 | |
| remotes/hub_standard/bug/hidev-196-master | |
| remotes/hub_standard/bug/hidev-198 | |
| remotes/hub_standard/bug/hidev-198-master | |
| remotes/hub_standard/bug/hidev-1998 | |
| remotes/hub_standard/bug/hidev-2076 | |
| remotes/hub_standard/bug/hidev-2091 | |
| remotes/hub_standard/bug/hidev-2126 | |
| remotes/hub_standard/bug/hidev-2199 | |
| remotes/hub_standard/bug/hidev-2303 | |
| remotes/hub_standard/bug/hidev-2303-1.8 | |
| remotes/hub_standard/bug/hidev-2437 | |
| remotes/hub_standard/bug/hidev-2437-1.8 | |
| remotes/hub_standard/bug/hidev-2437-master | |
| remotes/hub_standard/bug/hidev-2546 | |
| remotes/hub_standard/bug/hidev-2656 | |
| remotes/hub_standard/bug/hidev-2710 | |
| remotes/hub_standard/bug/hidev-2779 | |
| remotes/hub_standard/bug/hidev-2845-1.11 | |
| remotes/hub_standard/bug/hidev-2855 | |
| remotes/hub_standard/bug/hidev-2860 | |
| remotes/hub_standard/bug/hidev-2921 | |
| remotes/hub_standard/bug/hidev-2938 | |
| remotes/hub_standard/bug/hidev-2983 | |
| remotes/hub_standard/bug/hidev-301 | |
| remotes/hub_standard/bug/hidev-3116 | |
| remotes/hub_standard/bug/hidev-3116-1.11 | |
| remotes/hub_standard/bug/hidev-3126 | |
| remotes/hub_standard/bug/hidev-3163 | |
| remotes/hub_standard/bug/hidev-3164 | |
| remotes/hub_standard/bug/hidev-3164-1.8 | |
| remotes/hub_standard/bug/hidev-3164-1.8-update | |
| remotes/hub_standard/bug/hidev-3164-update | |
| remotes/hub_standard/bug/hidev-3213 | |
| remotes/hub_standard/bug/hidev-3311 | |
| remotes/hub_standard/bug/hidev-3358 | |
| remotes/hub_standard/bug/hidev-3374 | |
| remotes/hub_standard/bug/hidev-3392 | |
| remotes/hub_standard/bug/hidev-3393-1.10 | |
| remotes/hub_standard/bug/hidev-3393-master | |
| remotes/hub_standard/bug/hidev-3425 | |
| remotes/hub_standard/bug/hidev-3460-1.11 | |
| remotes/hub_standard/bug/hidev-3462 | |
| remotes/hub_standard/bug/hidev-350 | |
| remotes/hub_standard/bug/hidev-3534 | |
| remotes/hub_standard/bug/hidev-3560-1.10 | |
| remotes/hub_standard/bug/hidev-3560-1.11 | |
| remotes/hub_standard/bug/hidev-3564 | |
| remotes/hub_standard/bug/hidev-3595-1.11 | |
| remotes/hub_standard/bug/hidev-3634 | |
| remotes/hub_standard/bug/hidev-3660 | |
| remotes/hub_standard/bug/hidev-3672 | |
| remotes/hub_standard/bug/hidev-3728-master | |
| remotes/hub_standard/bug/hidev-3799 | |
| remotes/hub_standard/bug/hidev-3799-master | |
| remotes/hub_standard/bug/hidev-3872 | |
| remotes/hub_standard/bug/hidev-3986-1.11 | |
| remotes/hub_standard/bug/hidev-4014-1.11 | |
| remotes/hub_standard/bug/hidev-4014-master | |
| remotes/hub_standard/bug/hidev-4026 | |
| remotes/hub_standard/bug/hidev-4027 | |
| remotes/hub_standard/bug/hidev-4056 | |
| remotes/hub_standard/bug/hidev-4066-1.11 | |
| remotes/hub_standard/bug/hidev-4085 | |
| remotes/hub_standard/bug/hidev-4085-ghostbusters | |
| remotes/hub_standard/bug/hidev-4085-master | |
| remotes/hub_standard/bug/hidev-4091 | |
| remotes/hub_standard/bug/hidev-4129 | |
| remotes/hub_standard/bug/hidev-4129-1.11.1-rc1 | |
| remotes/hub_standard/bug/hidev-4129-master | |
| remotes/hub_standard/bug/hidev-4279-1.10.5.9 | |
| remotes/hub_standard/bug/hidev-4279-1.11 | |
| remotes/hub_standard/bug/hidev-4279-master | |
| remotes/hub_standard/bug/hidev-4291 | |
| remotes/hub_standard/bug/hidev-4291-1.11 | |
| remotes/hub_standard/bug/hidev-4355-1.11 | |
| remotes/hub_standard/bug/hidev-4355-master | |
| remotes/hub_standard/bug/hidev-4361-1.11.1-rc1 | |
| remotes/hub_standard/bug/hidev-4361-master | |
| remotes/hub_standard/bug/hidev-4368-1.11.1-rc1 | |
| remotes/hub_standard/bug/hidev-4368-master | |
| remotes/hub_standard/bug/hidev-4396 | |
| remotes/hub_standard/bug/hidev-4396-1.11.1-rc1 | |
| remotes/hub_standard/bug/hidev-4425 | |
| remotes/hub_standard/bug/hidev-4425-1.11 | |
| remotes/hub_standard/bug/hidev-4453-1.11-curl | |
| remotes/hub_standard/bug/hidev-4542 | |
| remotes/hub_standard/bug/hidev-4547-master | |
| remotes/hub_standard/bug/hidev-4575 | |
| remotes/hub_standard/bug/hidev-459 | |
| remotes/hub_standard/bug/hidev-4620 | |
| remotes/hub_standard/bug/hidev-4657 | |
| remotes/hub_standard/bug/hidev-4657-1.11 | |
| remotes/hub_standard/bug/hidev-475 | |
| remotes/hub_standard/bug/hidev-481 | |
| remotes/hub_standard/bug/hidev-483 | |
| remotes/hub_standard/bug/hidev-4895-1.11.2-rc | |
| remotes/hub_standard/bug/hidev-4965 | |
| remotes/hub_standard/bug/hidev-4965-hotfix | |
| remotes/hub_standard/bug/hidev-5028-1.11.2-rc | |
| remotes/hub_standard/bug/hidev-5033 | |
| remotes/hub_standard/bug/hidev-5055-1.11 | |
| remotes/hub_standard/bug/hidev-5055-1.11.2-rc | |
| remotes/hub_standard/bug/hidev-5056-1.11.1.9-hotfix | |
| remotes/hub_standard/bug/hidev-5099 | |
| remotes/hub_standard/bug/hidev-5099-2 | |
| remotes/hub_standard/bug/hidev-5128 | |
| remotes/hub_standard/bug/hidev-5128-1.10 | |
| remotes/hub_standard/bug/hidev-5202 | |
| remotes/hub_standard/bug/hidev-5218-1.12 | |
| remotes/hub_standard/bug/hidev-5228 | |
| remotes/hub_standard/bug/hidev-5229 | |
| remotes/hub_standard/bug/hidev-5242 | |
| remotes/hub_standard/bug/hidev-551 | |
| remotes/hub_standard/bug/hidev-552 | |
| remotes/hub_standard/bug/hidev-594 | |
| remotes/hub_standard/bug/hidev-617 | |
| remotes/hub_standard/bug/hidev-649 | |
| remotes/hub_standard/bug/hidev-659 | |
| remotes/hub_standard/bug/hidev-659-1.6 | |
| remotes/hub_standard/bug/hidev-664 | |
| remotes/hub_standard/bug/hidev-717 | |
| remotes/hub_standard/bug/hidev-722 | |
| remotes/hub_standard/bug/hidev-788 | |
| remotes/hub_standard/bug/hidev-788-disable | |
| remotes/hub_standard/bug/hidev-788-enable | |
| remotes/hub_standard/bug/hidev-871 | |
| remotes/hub_standard/bug/hidev-895 | |
| remotes/hub_standard/bug/hidev-972 | |
| remotes/hub_standard/bug/hidev-hidev-3163 | |
| remotes/hub_standard/bug/opsaud-2127 | |
| remotes/hub_standard/bug/opshub-2276 | |
| remotes/hub_standard/bug/opshub-2465 | |
| remotes/hub_standard/bug/opshub-2641-1.5 | |
| remotes/hub_standard/bug/opshub-2641-master | |
| remotes/hub_standard/bug/opshub-3302 | |
| remotes/hub_standard/bug/opshub-3302-cleanup | |
| remotes/hub_standard/bug/opshub-3327 | |
| remotes/hub_standard/bug/opshub-3327-master | |
| remotes/hub_standard/bug/opshub-3347 | |
| remotes/hub_standard/bug/opshub-3347-master | |
| remotes/hub_standard/bug/opshub-3444 | |
| remotes/hub_standard/bug/opshub-3455 | |
| remotes/hub_standard/bug/opshub-3458 | |
| remotes/hub_standard/bug/opshub-3503 | |
| remotes/hub_standard/bug/opshub-3503-1.5 | |
| remotes/hub_standard/bug/opshub-3556 | |
| remotes/hub_standard/bug/opshub-3556-1.6 | |
| remotes/hub_standard/bug/opshub-3584 | |
| remotes/hub_standard/bug/opshub-3615 | |
| remotes/hub_standard/bug/opshub-3615-master | |
| remotes/hub_standard/bug/opshub-3657 | |
| remotes/hub_standard/bug/opshub-3676 | |
| remotes/hub_standard/bug/opshub-3676-master | |
| remotes/hub_standard/bug/opshub-3761-1.6 | |
| remotes/hub_standard/bug/opshub-3761-master | |
| remotes/hub_standard/bug/opshub-3786-1.6 | |
| remotes/hub_standard/bug/opshub-3786-master | |
| remotes/hub_standard/bug/opshub-3813 | |
| remotes/hub_standard/bug/opshub-3842 | |
| remotes/hub_standard/bug/opshub-3842-1.6 | |
| remotes/hub_standard/bug/opshub-3864 | |
| remotes/hub_standard/bug/opshub-3864-master | |
| remotes/hub_standard/bug/opshub-3943 | |
| remotes/hub_standard/bug/opshub-3943-master | |
| remotes/hub_standard/bug/opshub-4025 | |
| remotes/hub_standard/bug/opshub-4025-1.6 | |
| remotes/hub_standard/bug/opshub-4067 | |
| remotes/hub_standard/bug/opshub-4067-1.6 | |
| remotes/hub_standard/bug/opshub-4112 | |
| remotes/hub_standard/bug/opshub-4112-1.6 | |
| remotes/hub_standard/bug/opshub-4178 | |
| remotes/hub_standard/bug/opshub-4178-master | |
| remotes/hub_standard/bug/opshub-4186 | |
| remotes/hub_standard/bug/opshub-4221-1.6 | |
| remotes/hub_standard/bug/opshub-4315 | |
| remotes/hub_standard/bug/opshub-4315-master | |
| remotes/hub_standard/bug/opshub-4409 | |
| remotes/hub_standard/bug/opshub-4409-master | |
| remotes/hub_standard/bug/opshub-4411 | |
| remotes/hub_standard/bug/opshub-4411-1.6 | |
| remotes/hub_standard/bug/opshub-4422 | |
| remotes/hub_standard/bug/opshub-4422-master | |
| remotes/hub_standard/bug/opshub-4514-1.6 | |
| remotes/hub_standard/bug/opshub-4514-master | |
| remotes/hub_standard/bug/opshub-4524 | |
| remotes/hub_standard/bug/opshub-4524-1.6 | |
| remotes/hub_standard/bug/opshub-4524-master | |
| remotes/hub_standard/bug/opshub-4606 | |
| remotes/hub_standard/bug/opshub-4688 | |
| remotes/hub_standard/bug/opshub-4725 | |
| remotes/hub_standard/bug/smart-255 | |
| remotes/hub_standard/bug/smart-255-master | |
| remotes/hub_standard/bugs/hidev-581 | |
| remotes/hub_standard/build.ini | |
| remotes/hub_standard/chimay | |
| remotes/hub_standard/ci | |
| remotes/hub_standard/collections-features | |
| remotes/hub_standard/comp_training | |
| remotes/hub_standard/component-versions | |
| remotes/hub_standard/component-versions-master | |
| remotes/hub_standard/component-versions-master-1015 | |
| remotes/hub_standard/component-versions-master-1110 | |
| remotes/hub_standard/config | |
| remotes/hub_standard/config_changes | |
| remotes/hub_standard/cotopaxi | |
| remotes/hub_standard/cube | |
| remotes/hub_standard/damavand | |
| remotes/hub_standard/dataservices | |
| remotes/hub_standard/delirium | |
| remotes/hub_standard/demo | |
| remotes/hub_standard/demo-dashboard | |
| remotes/hub_standard/doug-local-template-rev | |
| remotes/hub_standard/doug_pollfix | |
| remotes/hub_standard/ds2 | |
| remotes/hub_standard/dune | |
| remotes/hub_standard/edition-versions | |
| remotes/hub_standard/elephant | |
| remotes/hub_standard/elephant-with-caching | |
| remotes/hub_standard/epic/hidev-1151 | |
| remotes/hub_standard/epic/hidev-1928 | |
| remotes/hub_standard/epic/hidev-2170 | |
| remotes/hub_standard/epic/hidev-2518 | |
| remotes/hub_standard/epic/hidev-2660 | |
| remotes/hub_standard/epic/hidev-2660-1.11 | |
| remotes/hub_standard/epic/hidev-2677 | |
| remotes/hub_standard/epic/hidev-3139 | |
| remotes/hub_standard/epic/hidev-3139-1.11 | |
| remotes/hub_standard/epic/hidev-3178 | |
| remotes/hub_standard/epic/hidev-3193 | |
| remotes/hub_standard/epic/hidev-3480 | |
| remotes/hub_standard/epic/hidev-3984 | |
| remotes/hub_standard/epic/hidev-3994 | |
| remotes/hub_standard/epic/hidev-3994-merge-master | |
| remotes/hub_standard/epic/hidev-4035 | |
| remotes/hub_standard/epic/hidev-4035-1.11 | |
| remotes/hub_standard/epic/hidev-4035-m | |
| remotes/hub_standard/epic/hidev-4173 | |
| remotes/hub_standard/epic/hidev-4191 | |
| remotes/hub_standard/epic/hidev-98 | |
| remotes/hub_standard/epic/opshub-2544 | |
| remotes/hub_standard/epic/opshub-2544-working | |
| remotes/hub_standard/epic/pinbox/cnetcms-762 | |
| remotes/hub_standard/et | |
| remotes/hub_standard/everest | |
| remotes/hub_standard/feature/hidev-1076-qcatshark | |
| remotes/hub_standard/feature/hidev-1076-rockfish | |
| remotes/hub_standard/feature/hidev-1193 | |
| remotes/hub_standard/feature/hidev-1313 | |
| remotes/hub_standard/feature/hidev-1687 | |
| remotes/hub_standard/feature/hidev-1829 | |
| remotes/hub_standard/feature/hidev-1840 | |
| remotes/hub_standard/feature/hidev-2295 | |
| remotes/hub_standard/feature/hidev-2418 | |
| remotes/hub_standard/feature/hidev-394 | |
| remotes/hub_standard/feature/hidev-4780-1.11 | |
| remotes/hub_standard/feature/hidev-4950-1.11.1-cnet | |
| remotes/hub_standard/feature/hidev-4950-1.12 | |
| remotes/hub_standard/feature/inspectextension | |
| remotes/hub_standard/feature/opshub-3482 | |
| remotes/hub_standard/feature/opshub-3552 | |
| remotes/hub_standard/feature/opshub-3554 | |
| remotes/hub_standard/feature/opshub-3787 | |
| remotes/hub_standard/feature/opshub-3787-master | |
| remotes/hub_standard/feature/opshub-3985 | |
| remotes/hub_standard/feature/opshub-3985-1.6 | |
| remotes/hub_standard/feed-server2 | |
| remotes/hub_standard/feed-server3 | |
| remotes/hub_standard/fix-gitignore | |
| remotes/hub_standard/forums | |
| remotes/hub_standard/frankenstein | |
| remotes/hub_standard/freefresh | |
| remotes/hub_standard/fuji | |
| remotes/hub_standard/ghost | |
| remotes/hub_standard/gongga | |
| remotes/hub_standard/haleakala | |
| remotes/hub_standard/hellraiser | |
| remotes/hub_standard/hidev-3753 | |
| remotes/hub_standard/hubCst | |
| remotes/hub_standard/improvement/opshub-3602 | |
| remotes/hub_standard/improvement/opshub-3748-1.6 | |
| remotes/hub_standard/improvement/opshub-3748-master | |
| remotes/hub_standard/improvement/opshub-3909-1.6 | |
| remotes/hub_standard/improvement/opshub-3909-master | |
| remotes/hub_standard/improvement/opshub-4033 | |
| remotes/hub_standard/improvement/opshub-4033-master | |
| remotes/hub_standard/master | |
| remotes/hub_standard/master-1.8-merge | |
| remotes/hub_standard/noissue-1.6 | |
| remotes/hub_standard/opshub-3183 | |
| remotes/hub_standard/opshub-3302-cherry-pick | |
| remotes/hub_standard/otter | |
| remotes/hub_standard/pittsd/fix-oscar | |
| remotes/hub_standard/platypus | |
| remotes/hub_standard/qa | |
| remotes/hub_standard/qcatshark | |
| remotes/hub_standard/recommendationsComponent | |
| remotes/hub_standard/regAdminTool-2.2 | |
| remotes/hub_standard/regAdminTool-GAT | |
| remotes/hub_standard/regAdminTool-GAT-master | |
| remotes/hub_standard/regAdminTool2 | |
| remotes/hub_standard/regAdminTool3 | |
| remotes/hub_standard/regAdmintool | |
| remotes/hub_standard/richtextComponent | |
| remotes/hub_standard/ricky | |
| remotes/hub_standard/rockfish | |
| remotes/hub_standard/seamonkey | |
| remotes/hub_standard/shadow-page-preview | |
| remotes/hub_standard/shadow-page-test | |
| remotes/hub_standard/smoke | |
| remotes/hub_standard/story/HIDEV-773-master | |
| remotes/hub_standard/story/HIDEV-937-1.7 | |
| remotes/hub_standard/story/HIDEV-937-master | |
| remotes/hub_standard/story/hidev-1063 | |
| remotes/hub_standard/story/hidev-109 | |
| remotes/hub_standard/story/hidev-1494 | |
| remotes/hub_standard/story/hidev-1494-1.11 | |
| remotes/hub_standard/story/hidev-1494-master | |
| remotes/hub_standard/story/hidev-1768-rockfish | |
| remotes/hub_standard/story/hidev-1947 | |
| remotes/hub_standard/story/hidev-2032 | |
| remotes/hub_standard/story/hidev-2172 | |
| remotes/hub_standard/story/hidev-2265 | |
| remotes/hub_standard/story/hidev-2265-vampiresquid | |
| remotes/hub_standard/story/hidev-2266 | |
| remotes/hub_standard/story/hidev-2267 | |
| remotes/hub_standard/story/hidev-2267-bladerunner | |
| remotes/hub_standard/story/hidev-2267-datafix | |
| remotes/hub_standard/story/hidev-2268 | |
| remotes/hub_standard/story/hidev-2398 | |
| remotes/hub_standard/story/hidev-2423 | |
| remotes/hub_standard/story/hidev-2510 | |
| remotes/hub_standard/story/hidev-2525 | |
| remotes/hub_standard/story/hidev-2533 | |
| remotes/hub_standard/story/hidev-2533-kenh | |
| remotes/hub_standard/story/hidev-2535 | |
| remotes/hub_standard/story/hidev-2535-1.11 | |
| remotes/hub_standard/story/hidev-2580 | |
| remotes/hub_standard/story/hidev-2581 | |
| remotes/hub_standard/story/hidev-2599 | |
| remotes/hub_standard/story/hidev-2632 | |
| remotes/hub_standard/story/hidev-2837 | |
| remotes/hub_standard/story/hidev-2845 | |
| remotes/hub_standard/story/hidev-2869 | |
| remotes/hub_standard/story/hidev-2987-master | |
| remotes/hub_standard/story/hidev-2998 | |
| remotes/hub_standard/story/hidev-3002-1.11 | |
| remotes/hub_standard/story/hidev-3007 | |
| remotes/hub_standard/story/hidev-3150 | |
| remotes/hub_standard/story/hidev-3169 | |
| remotes/hub_standard/story/hidev-3180-tan | |
| remotes/hub_standard/story/hidev-3247 | |
| remotes/hub_standard/story/hidev-3300 | |
| remotes/hub_standard/story/hidev-3300-master | |
| remotes/hub_standard/story/hidev-3301 | |
| remotes/hub_standard/story/hidev-3301-master | |
| remotes/hub_standard/story/hidev-3302 | |
| remotes/hub_standard/story/hidev-3402 | |
| remotes/hub_standard/story/hidev-3440 | |
| remotes/hub_standard/story/hidev-3443 | |
| remotes/hub_standard/story/hidev-3528 | |
| remotes/hub_standard/story/hidev-3528-1.10 | |
| remotes/hub_standard/story/hidev-3577 | |
| remotes/hub_standard/story/hidev-3579 | |
| remotes/hub_standard/story/hidev-3970 | |
| remotes/hub_standard/story/hidev-4031 | |
| remotes/hub_standard/story/hidev-4037 | |
| remotes/hub_standard/story/hidev-4038 | |
| remotes/hub_standard/story/hidev-4040 | |
| remotes/hub_standard/story/hidev-4042 | |
| remotes/hub_standard/story/hidev-4050 | |
| remotes/hub_standard/story/hidev-4166 | |
| remotes/hub_standard/story/hidev-4168 | |
| remotes/hub_standard/story/hidev-4420 | |
| remotes/hub_standard/story/hidev-4511 | |
| remotes/hub_standard/story/hidev-4624 | |
| remotes/hub_standard/story/hidev-4764 | |
| remotes/hub_standard/story/hidev-51 | |
| remotes/hub_standard/story/hidev-5155 | |
| remotes/hub_standard/story/hidev-5158 | |
| remotes/hub_standard/story/hidev-5158-1.12 | |
| remotes/hub_standard/story/hidev-5213 | |
| remotes/hub_standard/story/hidev-5282 | |
| remotes/hub_standard/story/hidev-942 | |
| remotes/hub_standard/story/opshub-3685 | |
| remotes/hub_standard/story/opshub-4344 | |
| remotes/hub_standard/story/opshub-4378 | |
| remotes/hub_standard/story/opshub-4378-1.6 | |
| remotes/hub_standard/task/HIGHDEV-2698 | |
| remotes/hub_standard/task/dwinf-209 | |
| remotes/hub_standard/task/dwinf-209-1 | |
| remotes/hub_standard/task/dwinf-210 | |
| remotes/hub_standard/task/hidev-108 | |
| remotes/hub_standard/task/hidev-1176 | |
| remotes/hub_standard/task/hidev-1418 | |
| remotes/hub_standard/task/hidev-1810 | |
| remotes/hub_standard/task/hidev-2250 | |
| remotes/hub_standard/task/hidev-2615 | |
| remotes/hub_standard/task/hidev-2698 | |
| remotes/hub_standard/task/hidev-2722 | |
| remotes/hub_standard/task/hidev-2723 | |
| remotes/hub_standard/task/hidev-2860 | |
| remotes/hub_standard/task/hidev-2979 | |
| remotes/hub_standard/task/hidev-3038 | |
| remotes/hub_standard/task/hidev-3753 | |
| remotes/hub_standard/task/hidev-3836 | |
| remotes/hub_standard/task/hidev-3836-1.11 | |
| remotes/hub_standard/task/hidev-4027 | |
| remotes/hub_standard/task/hidev-4459 | |
| remotes/hub_standard/task/hidev-4459-1.11 | |
| remotes/hub_standard/task/hidev-4592 | |
| remotes/hub_standard/task/hidev-4648-master | |
| remotes/hub_standard/task/hidev-4658 | |
| remotes/hub_standard/task/hidev-5280 | |
| remotes/hub_standard/task/hidev-5280-1.11-cnet | |
| remotes/hub_standard/task/hidev-5280-master-1.11-mergebase | |
| remotes/hub_standard/task/hidev-685 | |
| remotes/hub_standard/task/hidev-964 | |
| remotes/hub_standard/task/opshub-2149 | |
| remotes/hub_standard/task/opshub-2149-1.6 | |
| remotes/hub_standard/task/opshub-2425 | |
| remotes/hub_standard/task/opshub-2432 | |
| remotes/hub_standard/task/opshub-3341 | |
| remotes/hub_standard/task/opshub-3625 | |
| remotes/hub_standard/task/opshub-3706 | |
| remotes/hub_standard/task/opshub-3706-master | |
| remotes/hub_standard/task/opshub-3756 | |
| remotes/hub_standard/task/opshub-3909 | |
| remotes/hub_standard/task/opshub-3912 | |
| remotes/hub_standard/task/opshub-3912-1.6 | |
| remotes/hub_standard/task/opshub-4053-1.6 | |
| remotes/hub_standard/task/opshub-4053-master | |
| remotes/hub_standard/task/opshub-4139 | |
| remotes/hub_standard/task/opshub-4139-1.6 | |
| remotes/hub_standard/task/opshub-4497 | |
| remotes/hub_standard/task/opshub-4497-master | |
| remotes/hub_standard/task/opshub-4580 | |
| remotes/hub_standard/the-high-road | |
| remotes/hub_standard/triggerfish | |
| remotes/hub_standard/unicornfish | |
| remotes/hub_standard/vampiresquid | |
| remotes/hub_standard/walrus | |
| remotes/hub_standard/xray | |
| remotes/hub_standard/yellow | |
| remotes/hub_standard/zissou | |
| remotes/origin/1.11.1-rc1 | |
| remotes/origin/HEAD -> origin/master | |
| remotes/origin/SPORTSHL-1404 | |
| remotes/origin/bug/sportshl-1424 | |
| remotes/origin/bug/sportshl-1558 | |
| remotes/origin/bug/sportshl-1588 | |
| remotes/origin/master | |
| remotes/origin/sportshl-1396 | |
| remotes/origin/sportshl-1404 | |
| remotes/origin/sportshl-1405 | |
| remotes/origin/sportshl-1436 | |
| remotes/origin/sportshl-1438 | |
| remotes/origin/sportshl-1445 | |
| remotes/origin/sportshl-1451 | |
| remotes/origin/sportshl-1577 | |
| remotes/origin/sportshl-1604 | |
| remotes/origin/sportshl-1625 | |
| remotes/origin/sportshl-1631 | |
| remotes/origin/sportshl-889 | |
| remotes/origin/story/SPORTSHL-1393 | |
| remotes/origin/story/sportshl-1142 | |
| remotes/origin/story/sportshl-1332-1.11.1-rc1 | |
| remotes/origin/story/sportshl-1385 | |
| remotes/origin/story/sportshl-1394 | |
| remotes/origin/story/sportshl-1406 | |
| remotes/origin/story/sportshl-1410 | |
| remotes/origin/story/sportshl-1416 | |
| remotes/origin/story/sportshl-1433 | |
| remotes/origin/story/sportshl-1438 | |
| remotes/origin/story/sportshl-1448 | |
| remotes/origin/story/sportshl-1449 | |
| remotes/origin/story/sportshl-1480 | |
| remotes/origin/story/sportshl-1548 | |
| remotes/origin/story/sportshl-1554 | |
| remotes/origin/story/sportshl-1556 | |
| remotes/origin/story/sportshl-1573 | |
| remotes/origin/story/sportshl-1575 | |
| remotes/origin/story/sportshl-1624 | |
| remotes/origin/task/sportshl-1237 | |
| remotes/origin/task/sportshl-1402 | |
| remotes/origin/task/sportshl-1435 | |
| remotes/origin/task/sportshl-1440 | |
| remotes/origin/task/sportshl-1442 |
This file contains 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
| [user] | |
| name = Ryan Neufeld | |
| email = ryan.neufeld@ placeiwork.com | |
| [alias] | |
| br = branch | |
| ci = commit | |
| co = checkout | |
| df = diff | |
| g = grep -I | |
| lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative | |
| lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all | |
| pb = publish-branch | |
| sm = show-merges | |
| st = status | |
| remotes = remote -v | |
| tags = tag -l | |
| branches = branch -l | |
| [color] | |
| ui = auto | |
| [color "branch"] | |
| current = yellow reverse | |
| local = yellow | |
| remote = green | |
| [color "diff"] | |
| meta = yellow bold | |
| frag = magenta bold | |
| old = red bold | |
| new = green bold | |
| [color "status"] | |
| added = yellow | |
| changed = green | |
| untracked = cyan | |
| [merge] | |
| log = true | |
| #[rerere] | |
| # enabled = 1 | |
| [diff "exif"] | |
| textconv = exiftool | |
| [core] | |
| excludesfile = /Users/ryan/.gitignore | |
| attributesfile = ~/.gitattributes | |
| whitespace = space-before-tab,indent-with-non-tab,trailing-space | |
| autocrlf = input | |
| safecrlf = false | |
| ;editor = subl -w | |
| [help] | |
| autocorrect = 1 | |
| [push] | |
| default = simple | |
| [credential] | |
| helper = osxkeychain | |
| [diff] | |
| algorithm = patience |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment