From a483a05335c753555aba8c4529a62eb50b470028 Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Mon, 16 May 2011 14:07:48 -0700 Subject: Update files to match new style guide --- _posts/2009-06-23-security.markdown | 2 +- _posts/2009-07-04-git-html-help.markdown | 4 +-- _posts/2009-09-09-removing-sensitive-data.markdown | 2 +- ...2009-09-27-splitting-a-subpath-to-a-new-repo.md | 29 ++++++++++++++++++++++ ...09-27-splitting-a-subpath-to-a-new-repo.textile | 28 --------------------- _posts/2009-10-10-subtree-merge.markdown | 2 +- _posts/2010-01-12-terms.markdown | 6 ++--- _posts/2010-01-15-dmca.markdown | 10 ++++---- _posts/2010-01-16-deploy-keys.markdown | 2 +- _posts/2010-01-19-multiple-keys.markdown | 2 +- _posts/2010-01-27-remotes.markdown | 2 +- _posts/2010-01-28-git-ignore.markdown | 2 +- _posts/2010-01-29-rebase.markdown | 2 +- _posts/2010-03-02-changing-author-info.markdown | 4 +-- _posts/2010-06-02-svn-importing.markdown | 2 +- 15 files changed, 50 insertions(+), 49 deletions(-) create mode 100644 _posts/2009-09-27-splitting-a-subpath-to-a-new-repo.md delete mode 100644 _posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile diff --git a/_posts/2009-06-23-security.markdown b/_posts/2009-06-23-security.markdown index e87f7e7..b136465 100644 --- a/_posts/2009-06-23-security.markdown +++ b/_posts/2009-06-23-security.markdown @@ -4,7 +4,7 @@ title: GitHub Security categories: site_policy --- -We know your code is extremely important to you and your business and we're very protective of it. After all, GitHub's code is hosted on GitHub, too! +

We know your code is extremely important to you and your business and we're very protective of it. After all, GitHub's code is hosted on GitHub, too!

Physical Security ----------------- diff --git a/_posts/2009-07-04-git-html-help.markdown b/_posts/2009-07-04-git-html-help.markdown index b945edb..d77d28f 100644 --- a/_posts/2009-07-04-git-html-help.markdown +++ b/_posts/2009-07-04-git-html-help.markdown @@ -5,9 +5,9 @@ description: How to install the local git HTML help files categories: other --- -This guide will help you install the local git HTML help files and set git to use them by default instead of the man pages. +

This guide will help you install the local git HTML help files and set git to use them by default instead of the man pages.

-Most git installations will install man files for help, but not the HTML help files (the same files seen on git's [online documentation](http://www.kernel.org/pub/software/scm/git-core/docs/)). Installing these help files is a fairly simple process. +

Most git installations will install man files for help, but not the HTML help files (the same files seen on git's online documentation). Installing these help files is a fairly simple process.

Windows ------- diff --git a/_posts/2009-09-09-removing-sensitive-data.markdown b/_posts/2009-09-09-removing-sensitive-data.markdown index a4e10c4..ed316ed 100644 --- a/_posts/2009-09-09-removing-sensitive-data.markdown +++ b/_posts/2009-09-09-removing-sensitive-data.markdown @@ -6,7 +6,7 @@ categories: popular git_ninjutsu terminal_pres: true --- -From time to time users accidentally commit data like passwords or keys into a git repo. While you can use `git rm` to remove the file, it will still be in the repo's history. Fortunately, git makes it fairly simple to remove the file from the entire repo history. +

From time to time users accidentally commit data like passwords or keys into a git repo. While you can use git rm to remove the file, it will still be in the repo's history. Fortunately, git makes it fairly simple to remove the file from the entire repo history.

Change your password -------------------- diff --git a/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.md b/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.md new file mode 100644 index 0000000..5f36bab --- /dev/null +++ b/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.md @@ -0,0 +1,29 @@ +--- +layout: default +title: Splitting a subpath out into a new repo +description: How to generate a new repo from a subpath, retaining history. +categories: git_ninjutsu +--- + +

From time to time you may find that you want to make a new repo from a subpath of an existing repo. Perhaps you're moving some code out into a library or just want to have a common submodule across projects. Thanks to git, it's easy to do this without losing the history of that subpath in the process.

+ +The Good Stuff +-------------- + +Splitting a subpath into a repo is a fairly straightforward process, even if the command is hard to remember. For this example, we split lib/ out of the "GitHub gem":http://github.com/defunkt/github-gem repo, removing empty commits but retaining the path's history. + +
[tekkub@tekBook: ~/tmp] $ git clone git://github.com/defunkt/github-gem.git
+Initialized empty Git repository in /Users/tekkub/tmp/github-gem/.git/
+remote: Counting objects: 1301, done.
+remote: Compressing objects: 100% (769/769), done.
+remote: Total 1301 (delta 724), reused 910 (delta 522)
+Receiving objects: 100% (1301/1301), 164.39 KiB | 274 KiB/s, done.
+Resolving deltas: 100% (724/724), done.
+
+[tekkub@tekBook: ~/tmp] $ cd github-gem/
+
+[tekkub@tekBook: ~/tmp/github-gem master] $ git filter-branch --prune-empty --subdirectory-filter lib master
+Rewrite 48dc599c80e20527ed902928085e7861e6b3cbe6 (89/89)
+Ref 'refs/heads/master' was rewritten
+ +Now we have a re-written master branch that contains the files that were in lib/. We can simply add a remote to the new repo and push, or do whatever we want with the repo. diff --git a/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile b/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile deleted file mode 100644 index b54836c..0000000 --- a/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile +++ /dev/null @@ -1,28 +0,0 @@ ---- -layout: default -title: Splitting a subpath out into a new repo -description: How to generate a new repo from a subpath, retaining history. -categories: git_ninjutsu ---- - -From time to time you may find that you want to make a new repo from a subpath of an existing repo. Perhaps you're moving some code out into a library or just want to have a common submodule across projects. Thanks to git, it's easy to do this without losing the history of that subpath in the process. - -h2. The Good Stuff - -Splitting a subpath into a repo is a fairly straightforward process, even if the command is hard to remember. For this example, we split @lib/@ out of the "GitHub gem":http://github.com/defunkt/github-gem repo, removing empty commits but retaining the path's history. - -
[tekkub@tekBook: ~/tmp] $ git clone git://github.com/defunkt/github-gem.git
-Initialized empty Git repository in /Users/tekkub/tmp/github-gem/.git/
-remote: Counting objects: 1301, done.
-remote: Compressing objects: 100% (769/769), done.
-remote: Total 1301 (delta 724), reused 910 (delta 522)
-Receiving objects: 100% (1301/1301), 164.39 KiB | 274 KiB/s, done.
-Resolving deltas: 100% (724/724), done.
-
-[tekkub@tekBook: ~/tmp] $ cd github-gem/
-
-[tekkub@tekBook: ~/tmp/github-gem master] $ git filter-branch --prune-empty --subdirectory-filter lib master
-Rewrite 48dc599c80e20527ed902928085e7861e6b3cbe6 (89/89)
-Ref 'refs/heads/master' was rewritten
- -Now we have a re-written master branch that contains the files that were in @lib/@. We can simply add a remote to the new repo and push, or do whatever we want with the repo. diff --git a/_posts/2009-10-10-subtree-merge.markdown b/_posts/2009-10-10-subtree-merge.markdown index 53754e0..ab3ef49 100644 --- a/_posts/2009-10-10-subtree-merge.markdown +++ b/_posts/2009-10-10-subtree-merge.markdown @@ -5,7 +5,7 @@ description: How to use subtree merge to merge one repo into another as a subpat categories: git_ninjutsu --- -There are times when submodules are not adequate for the task at hand. For example, blending multiple repos together into one single repo while still maintaining the history of each repo. To do this, the subtree merge strategy is a better solution. +

There are times when submodules are not adequate for the task at hand. For example, blending multiple repos together into one single repo while still maintaining the history of each repo. To do this, the subtree merge strategy is a better solution.

Setting up and doing the first merge ------------------------------------ diff --git a/_posts/2010-01-12-terms.markdown b/_posts/2010-01-12-terms.markdown index 507c5ed..5e484c0 100644 --- a/_posts/2010-01-12-terms.markdown +++ b/_posts/2010-01-12-terms.markdown @@ -4,11 +4,11 @@ title: GitHub Terms of Service categories: site_policy --- -By using the GitHub.com web site ("Service"), or any services of GitHub Inc ("GitHub"), you are agreeing to be bound by the following terms and conditions ("Terms of Service"). IF YOU ARE ENTERING INTO THIS AGREEMENT ON BEHALF OF A COMPANY OR OTHER LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE AUTHORITY TO BIND SUCH ENTITY, ITS AFFILIATES AND ALL USERS WHO ACCESS OUR SERVICES THROUGH YOUR ACCOUNT TO THESE TERMS AND CONDITIONS, IN WHICH CASE THE TERMS "YOU" OR "YOUR" SHALL REFER TO SUCH ENTITY, ITS AFFILIATES AND USERS ASSOCIATED WITH IT. IF YOU DO NOT HAVE SUCH AUTHORITY, OR IF YOU DO NOT AGREE WITH THESE TERMS AND CONDITIONS, YOU MUST NOT ACCEPT THIS AGREEMENT AND MAY NOT USE THE SERVICES. +

By using the GitHub.com web site ("Service"), or any services of GitHub Inc ("GitHub"), you are agreeing to be bound by the following terms and conditions ("Terms of Service"). IF YOU ARE ENTERING INTO THIS AGREEMENT ON BEHALF OF A COMPANY OR OTHER LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE AUTHORITY TO BIND SUCH ENTITY, ITS AFFILIATES AND ALL USERS WHO ACCESS OUR SERVICES THROUGH YOUR ACCOUNT TO THESE TERMS AND CONDITIONS, IN WHICH CASE THE TERMS "YOU" OR "YOUR" SHALL REFER TO SUCH ENTITY, ITS AFFILIATES AND USERS ASSOCIATED WITH IT. IF YOU DO NOT HAVE SUCH AUTHORITY, OR IF YOU DO NOT AGREE WITH THESE TERMS AND CONDITIONS, YOU MUST NOT ACCEPT THIS AGREEMENT AND MAY NOT USE THE SERVICES.

-GitHub reserves the right to update and change the Terms of Service from time to time without notice. Any new features that augment or enhance the current Service, including the release of new tools and resources, shall be subject to the Terms of Service. Continued use of the Service after any such changes shall constitute your consent to such changes. You can review the most current version of the Terms of Service at any time at: +

GitHub reserves the right to update and change the Terms of Service from time to time without notice. Any new features that augment or enhance the current Service, including the release of new tools and resources, shall be subject to the Terms of Service. Continued use of the Service after any such changes shall constitute your consent to such changes. You can review the most current version of the Terms of Service at any time at: http://github.com/site/terms

-Violation of any of the terms below will result in the termination of your Account. While GitHub prohibits such conduct and Content on the Service, you understand and agree that GitHub cannot be responsible for the Content posted on the Service and you nonetheless may be exposed to such materials. You agree to use the Service at your own risk. +

Violation of any of the terms below will result in the termination of your Account. While GitHub prohibits such conduct and Content on the Service, you understand and agree that GitHub cannot be responsible for the Content posted on the Service and you nonetheless may be exposed to such materials. You agree to use the Service at your own risk.

A. Account Terms ---------------- diff --git a/_posts/2010-01-15-dmca.markdown b/_posts/2010-01-15-dmca.markdown index ed6b450..3efab6a 100644 --- a/_posts/2010-01-15-dmca.markdown +++ b/_posts/2010-01-15-dmca.markdown @@ -4,15 +4,15 @@ title: DMCA Takedown categories: site_policy --- -GitHub, Inc. ("GitHub") supports the protection of intellectual property and asks the users of the website GitHub.com to do the same. It is the policy of GitHub to respond to all notices of alleged copyright infringement. +

GitHub, Inc. ("GitHub") supports the protection of intellectual property and asks the users of the website GitHub.com to do the same. It is the policy of GitHub to respond to all notices of alleged copyright infringement.

-Notice is specifically given that GitHub is not responsible for the content on other websites that any user may find or access when using GitHub.com. This notice describes the information that should be provided in notices alleging copyright infringement found specifically on GitHub.com, and this notice is designed to make alleged infringement notices to GitHub as straightforward as possible and, at the same time, minimize the number of notices that GitHub receives that are spurious or difficult to verify. The form of notice set forth below is consistent with the form suggested by the United States Digital Millennium Copyright Act ("DMCA") which may be found at the U.S. Copyright official website: . +

Notice is specifically given that GitHub is not responsible for the content on other websites that any user may find or access when using GitHub.com. This notice describes the information that should be provided in notices alleging copyright infringement found specifically on GitHub.com, and this notice is designed to make alleged infringement notices to GitHub as straightforward as possible and, at the same time, minimize the number of notices that GitHub receives that are spurious or difficult to verify. The form of notice set forth below is consistent with the form suggested by the United States Digital Millennium Copyright Act ("DMCA") which may be found at the U.S. Copyright official website: http://www.copyright.gov.

-It is the policy of GitHub, in appropriate circumstances and in its sole discretion, to disable and/or terminate the accounts of users of GitHub.com who may infringe upon the copyrights or other intellectual property rights of GitHub and/or others. +

It is the policy of GitHub, in appropriate circumstances and in its sole discretion, to disable and/or terminate the accounts of users of GitHub.com who may infringe upon the copyrights or other intellectual property rights of GitHub and/or others.

-Our response to a notice of alleged copyright infringement may result in removing or disabling access to material claimed to be a copyright infringement and/or termination of the subscriber. If GitHub removes or disables access in response to such a notice, we will make a reasonable effort to contact the responsible party of our decision so that they may make an appropriate response. +

Our response to a notice of alleged copyright infringement may result in removing or disabling access to material claimed to be a copyright infringement and/or termination of the subscriber. If GitHub removes or disables access in response to such a notice, we will make a reasonable effort to contact the responsible party of our decision so that they may make an appropriate response.

-To file a notice of an alleged copyright infringement with us, you are required to provide a written communication only by email or postal mail. Notice is also given that you may be liable for damages (including costs and attorney fees) if you materially misrepresent that a product or activity is infringing upon your copyright. +

To file a notice of an alleged copyright infringement with us, you are required to provide a written communication only by email or postal mail. Notice is also given that you may be liable for damages (including costs and attorney fees) if you materially misrepresent that a product or activity is infringing upon your copyright.

A. Copyright Claims =================== diff --git a/_posts/2010-01-16-deploy-keys.markdown b/_posts/2010-01-16-deploy-keys.markdown index c68cff6..6f5bc4f 100644 --- a/_posts/2010-01-16-deploy-keys.markdown +++ b/_posts/2010-01-16-deploy-keys.markdown @@ -5,7 +5,7 @@ description: Do you need a deploy key? categories: deploying --- -Deploy keys are a handy yet misunderstood feature here on github. This guide will explain when and how to use them instead of normal user keys. +

Deploy keys are a handy yet misunderstood feature here on github. This guide will explain when and how to use them instead of normal user keys.

##Do you even need a deploy key? diff --git a/_posts/2010-01-19-multiple-keys.markdown b/_posts/2010-01-19-multiple-keys.markdown index bea4b6b..ea687ff 100644 --- a/_posts/2010-01-19-multiple-keys.markdown +++ b/_posts/2010-01-19-multiple-keys.markdown @@ -5,7 +5,7 @@ description: How to push using different SSH keys on the same computer categories: other --- -This guide assumes you have already created two keypairs and attached them to different GitHub user accounts. For this example we will be using `~/.ssh/id_rsa` attached to the user `joe` and `~/.ssh/id_rsa_client` attached to the user `client`. +

This guide assumes you have already created two keypairs and attached them to different GitHub user accounts. For this example we will be using ~/.ssh/id_rsa attached to the user joe and ~/.ssh/id_rsa_client attached to the user client.

Adding your keys to SSH ======================= diff --git a/_posts/2010-01-27-remotes.markdown b/_posts/2010-01-27-remotes.markdown index 2682832..6413e9c 100644 --- a/_posts/2010-01-27-remotes.markdown +++ b/_posts/2010-01-27-remotes.markdown @@ -5,7 +5,7 @@ description: Pushing, fetching, merging and deleting remote branches categories: everyday_git --- -This guide will cover all the basic day-to-day commands you will use with git to interact with remote repos. For push operations you can only interact with repos you own or are a collaborator on. To gain access to a public repo, check out the [forking guide](/forking). +

This guide will cover all the basic day-to-day commands you will use with git to interact with remote repos. For push operations you can only interact with repos you own or are a collaborator on. To gain access to a public repo, check out the forking guide.

Managing remotes ---------------- diff --git a/_posts/2010-01-28-git-ignore.markdown b/_posts/2010-01-28-git-ignore.markdown index 1f1d6a1..a05a6a5 100644 --- a/_posts/2010-01-28-git-ignore.markdown +++ b/_posts/2010-01-28-git-ignore.markdown @@ -5,7 +5,7 @@ description: How to tell git to ignore files categories: everyday_git --- -From time to time there are files you don't want git to track. There are a few methods of telling git what files to ignore. +

From time to time there are files you don't want git to track. There are a few methods of telling git what files to ignore.

.gitignore ---------- diff --git a/_posts/2010-01-29-rebase.markdown b/_posts/2010-01-29-rebase.markdown index 8fce0f6..40539cf 100644 --- a/_posts/2010-01-29-rebase.markdown +++ b/_posts/2010-01-29-rebase.markdown @@ -5,7 +5,7 @@ description: Using git rebase to restructure a branch categories: everyday_git --- -One often overlooked feature of git is the `git rebase` command. Rebase allows you to easily change a series of commits, reordering, editing, or squashing commits together into a single commit. +

One often overlooked feature of git is the git rebase command. Rebase allows you to easily change a series of commits, reordering, editing, or squashing commits together into a single commit.

It is considered bad practice to rebase commits which you have already pushed to a remote repo. Doing so may invoke the wrath of the git gods... you have been warned. diff --git a/_posts/2010-03-02-changing-author-info.markdown b/_posts/2010-03-02-changing-author-info.markdown index c567aef..76890c9 100644 --- a/_posts/2010-03-02-changing-author-info.markdown +++ b/_posts/2010-03-02-changing-author-info.markdown @@ -5,9 +5,9 @@ description: How to modify author info in your repo's history categories: git_ninjutsu --- -If you need to modify the author info in your repo's history, you can do so with this script. +

If you need to modify the author info in your repo's history, you can do so with this script.

-__Big bold warning__ This action is destructive to your repo's history. It's best to do this on a clone, just in case. Also beware that this should not be performed on a repo that has been shared with others. Use at your own risk. +

Big bold warning This action is destructive to your repo's history. It's best to do this on a clone, just in case. Also beware that this should not be performed on a repo that has been shared with others. Use at your own risk.

{% highlight bash %} #!/bin/sh diff --git a/_posts/2010-06-02-svn-importing.markdown b/_posts/2010-06-02-svn-importing.markdown index b5506ea..015a5c4 100644 --- a/_posts/2010-06-02-svn-importing.markdown +++ b/_posts/2010-06-02-svn-importing.markdown @@ -4,7 +4,7 @@ title: Importing from Subversion categories: other --- -GitHub can directly import SVN projects. All you need is the repository URL. After creating a repo you can pick "Import a Subversion Repository" option: +

GitHub can directly import SVN projects. All you need is the repository URL. After creating a repo you can pick "Import a Subversion Repository" option:

![](http://img.skitch.com/20100603-fq9q2b9qu7it37i2axhhntanqc.png) -- cgit v1.3.1