From a68ea20caaf7e99e7a0a0ad9c4bdd03ca312a8b2 Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Tue, 1 Mar 2011 14:37:04 -0800 Subject: [PATCH 001/247] Re-added old learn-more info --- index.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.markdown b/index.markdown index dbcf048..fa39911 100644 --- a/index.markdown +++ b/index.markdown @@ -21,6 +21,8 @@ If you are still new to things, we’ve provided a few walkthroughs to get y 4. [Fork a Repo](fork-a-repo) 5. [Be Social](be-social) +To learn more about git's commands, we highly recommend you check out [GitRef](http://gitref.org/), the [Pro Git book](http://progit.org/) and the [git man pages](http://www.kernel.org/pub/software/scm/git/docs/). If you need help or have any questions, feel free to [contact support](http://support.github.com) or [ask the community](http://groups.google.com/group/github/). + Popular guides -------------- From 7ddec23e263bf8caed7d8575a413738956079269 Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Tue, 1 Mar 2011 17:30:00 -0800 Subject: [PATCH 002/247] removed dollar sign from output text lines --- _posts/2011-02-15-linux-set-up-git.markdown | 2 +- _posts/2011-02-15-mac-set-up-git.markdown | 2 +- _posts/2011-02-15-win-set-up-git.markdown | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_posts/2011-02-15-linux-set-up-git.markdown b/_posts/2011-02-15-linux-set-up-git.markdown index 3177929..36004b6 100644 --- a/_posts/2011-02-15-linux-set-up-git.markdown +++ b/_posts/2011-02-15-linux-set-up-git.markdown @@ -54,7 +54,7 @@ To make sure you generate a brand new key, you need to check if one already exis

Output

-			$ This is output text.
+			This is output text.
 		

A line that does not begin with a $ is output text that is intended to give you information or tell you what to do next. We’ve colored output text green in these bootcamp tutorials.

diff --git a/_posts/2011-02-15-mac-set-up-git.markdown b/_posts/2011-02-15-mac-set-up-git.markdown index 57b1ea1..d339cdb 100644 --- a/_posts/2011-02-15-mac-set-up-git.markdown +++ b/_posts/2011-02-15-mac-set-up-git.markdown @@ -38,7 +38,7 @@ To make sure you generate a brand new key, you need to check if one already exis

Output

-			$ This is output text.
+			This is output text.
 		

A line that does not begin with a $ is output text that is intended to give you information or tell you what to do next. We’ve colored output text green in these bootcamp tutorials.

diff --git a/_posts/2011-02-15-win-set-up-git.markdown b/_posts/2011-02-15-win-set-up-git.markdown index 2db5d8d..c1605b7 100644 --- a/_posts/2011-02-15-win-set-up-git.markdown +++ b/_posts/2011-02-15-win-set-up-git.markdown @@ -51,7 +51,7 @@ To make sure you generate a brand new key, you need to check if one already exis

Output

-			$ This is output text.
+			This is output text.
 		

A line that does not begin with a $ is output text that is intended to give you information or tell you what to do next. We’ve colored output text green in these bootcamp tutorials.

From cbab86c80c90927999b630b30d0587cd558e0756 Mon Sep 17 00:00:00 2001 From: tekkub Date: Wed, 2 Mar 2011 00:01:01 -0700 Subject: [PATCH 003/247] Add os-specific categories to the new guides --- _posts/2011-02-15-linux-set-up-git.markdown | 1 + _posts/2011-02-15-mac-set-up-git.markdown | 1 + _posts/2011-02-15-win-set-up-git.markdown | 1 + 3 files changed, 3 insertions(+) diff --git a/_posts/2011-02-15-linux-set-up-git.markdown b/_posts/2011-02-15-linux-set-up-git.markdown index 36004b6..1564fd9 100644 --- a/_posts/2011-02-15-linux-set-up-git.markdown +++ b/_posts/2011-02-15-linux-set-up-git.markdown @@ -2,6 +2,7 @@ layout: default title: Set Up Git (Linux) description: A quick guide to help you get started with Git +categories: linux --- If you’ve found yourself on this page, we’re assuming you’re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way. diff --git a/_posts/2011-02-15-mac-set-up-git.markdown b/_posts/2011-02-15-mac-set-up-git.markdown index d339cdb..fa66b2d 100644 --- a/_posts/2011-02-15-mac-set-up-git.markdown +++ b/_posts/2011-02-15-mac-set-up-git.markdown @@ -2,6 +2,7 @@ layout: default title: Set Up Git (OSX) description: A quick guide to help you get started with Git +categories: mac --- If you’ve found yourself on this page, we’re assuming you’re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way. diff --git a/_posts/2011-02-15-win-set-up-git.markdown b/_posts/2011-02-15-win-set-up-git.markdown index c1605b7..d3f2e4f 100644 --- a/_posts/2011-02-15-win-set-up-git.markdown +++ b/_posts/2011-02-15-win-set-up-git.markdown @@ -2,6 +2,7 @@ layout: default title: Set Up Git (Windows) description: A quick guide to help you get started with Git +categories: windows --- If you’ve found yourself on this page, we’re assuming you’re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way. From bd6df9550885346307b4d042fc6b113e305a292f Mon Sep 17 00:00:00 2001 From: tekkub Date: Wed, 2 Mar 2011 00:11:21 -0700 Subject: [PATCH 004/247] Rename the new setup guides so they're at the top of their respective categories --- ...x-set-up-git.markdown => 2009-06-13-linux-set-up-git.markdown} | 0 ...mac-set-up-git.markdown => 2009-06-13-mac-set-up-git.markdown} | 0 ...win-set-up-git.markdown => 2009-06-13-win-set-up-git.markdown} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename _posts/{2011-02-15-linux-set-up-git.markdown => 2009-06-13-linux-set-up-git.markdown} (100%) rename _posts/{2011-02-15-mac-set-up-git.markdown => 2009-06-13-mac-set-up-git.markdown} (100%) rename _posts/{2011-02-15-win-set-up-git.markdown => 2009-06-13-win-set-up-git.markdown} (100%) diff --git a/_posts/2011-02-15-linux-set-up-git.markdown b/_posts/2009-06-13-linux-set-up-git.markdown similarity index 100% rename from _posts/2011-02-15-linux-set-up-git.markdown rename to _posts/2009-06-13-linux-set-up-git.markdown diff --git a/_posts/2011-02-15-mac-set-up-git.markdown b/_posts/2009-06-13-mac-set-up-git.markdown similarity index 100% rename from _posts/2011-02-15-mac-set-up-git.markdown rename to _posts/2009-06-13-mac-set-up-git.markdown diff --git a/_posts/2011-02-15-win-set-up-git.markdown b/_posts/2009-06-13-win-set-up-git.markdown similarity index 100% rename from _posts/2011-02-15-win-set-up-git.markdown rename to _posts/2009-06-13-win-set-up-git.markdown From 3a592ce3fcb350904d614baf90bc851c21dc805d Mon Sep 17 00:00:00 2001 From: tekkub Date: Wed, 2 Mar 2011 00:19:37 -0700 Subject: [PATCH 005/247] Add quasi-redirects from the old guides --- ...9-06-13-git-installation-redirect.markdown | 15 ++-- ...2009-06-14-linux-git-installation.markdown | 85 +------------------ .../2009-06-14-mac-git-installation.markdown | 34 +------- .../2009-06-14-win-git-installation.markdown | 22 +---- ...=> 2009-06-15-key-setup-redirect.markdown} | 17 ++-- ...le => 2009-06-15-linux-key-setup.markdown} | 0 ...tile => 2009-06-15-mac-key-setup.markdown} | 0 _posts/2009-06-15-msysgit-key-setup.markdown | 11 +++ _posts/2009-06-15-msysgit-key-setup.textile | 70 --------------- 9 files changed, 38 insertions(+), 216 deletions(-) rename _posts/{2009-06-15-key-setup-redirect.textile => 2009-06-15-key-setup-redirect.markdown} (56%) rename _posts/{2009-06-15-linux-key-setup.textile => 2009-06-15-linux-key-setup.markdown} (100%) rename _posts/{2009-06-15-mac-key-setup.textile => 2009-06-15-mac-key-setup.markdown} (100%) create mode 100644 _posts/2009-06-15-msysgit-key-setup.markdown delete mode 100644 _posts/2009-06-15-msysgit-key-setup.textile diff --git a/_posts/2009-06-13-git-installation-redirect.markdown b/_posts/2009-06-13-git-installation-redirect.markdown index 1589bdb..3040d7f 100644 --- a/_posts/2009-06-13-git-installation-redirect.markdown +++ b/_posts/2009-06-13-git-installation-redirect.markdown @@ -2,17 +2,16 @@ layout: default title: Installing git description: How to install git -categories: setup --- Attempting to redirect to the guide for your OS. If the redirect fails, pick your OS: -* [Windows](win-git-installation) -* [Mac](mac-git-installation) -* [Linux](linux-git-installation) +* [Windows](win-set-up-git) +* [Mac](mac-set-up-git) +* [Linux](linux-set-up-git) \ No newline at end of file + if (navigator.appVersion.indexOf("Win") != -1) {window.location = '/win-set-up-git'} + else if (navigator.appVersion.indexOf("Mac") != -1) {window.location = '/mac-set-up-git'} + else if (navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) {window.location = '/linux-set-up-git'} + diff --git a/_posts/2009-06-14-linux-git-installation.markdown b/_posts/2009-06-14-linux-git-installation.markdown index f2eabe8..97f5af4 100644 --- a/_posts/2009-06-14-linux-git-installation.markdown +++ b/_posts/2009-06-14-linux-git-installation.markdown @@ -2,87 +2,10 @@ layout: default title: Installing git (Linux) description: How to install git on Linux -categories: linux -main_category: setup --- -Ubuntu ------- +This page has moved. If the redirect fails, [click me](linux-set-up-git) -Git can be installed on ubuntu from the default package repositories using synaptic or apt-get. It is suggested you install git-core, git-gui, and git-doc. If you are moving from svn you may want to install git-svn as well. - -After you have completed installation you will need to [generate an SSH keypair](/linux-key-setup) and [set your local git config](/git-email-settings). - -### Synaptic (GUI) - -Launch Synaptic: - -![launch](http://img.skitch.com/20100224-b2qe2x24fke3y9y4s3tmb2mhjb.jpg) - -Select the packages you wish to install. - -![pick packs](http://img.skitch.com/20100224-cfpf7ki753fdw9tf89a7grgb1g.jpg) - -Click apply to install: - -![apply](http://img.skitch.com/20100224-82sg5b1pje12sjr3d8tkntmpmd.jpg) - -### apt-get (command line) - -
$ sudo apt-get install git-core git-gui git-doc
-Reading package lists... Done
-Building dependency tree
-Reading state information... Done
-The following packages were automatically installed and are no longer required:
-  linux-headers-2.6.28-11 linux-headers-2.6.28-11-generic
-Use 'apt-get autoremove' to remove them.
-The following extra packages will be installed:
-  gitk tcl tcl8.4 tk tk8.4
-Suggested packages:
-  git-arch git-cvs git-svn git-email git-daemon-run gitweb tclreadline
-The following NEW packages will be installed:
-  git-core git-doc git-gui gitk tcl tcl8.4 tk tk8.4
-0 upgraded, 8 newly installed, 0 to remove and 112 not upgraded.
-Need to get 4074kB/8396kB of archives.
-After this operation, 22.7MB of additional disk space will be used.
-Do you want to continue [Y/n]? y
-Get:1 http://us.archive.ubuntu.com jaunty/main git-doc 1:1.6.0.4-1ubuntu2 [1126kB]
-Get:2 http://us.archive.ubuntu.com jaunty/main tcl8.4 8.4.19-2 [1178kB]
-Get:3 http://us.archive.ubuntu.com jaunty/main tcl 8.4.16-2 [4154B]
-Get:4 http://us.archive.ubuntu.com jaunty/main tk8.4 8.4.19-2 [1019kB]
-Get:5 http://us.archive.ubuntu.com jaunty/main tk 8.4.16-2 [4184B]
-Get:6 http://us.archive.ubuntu.com jaunty/universe git-gui 1:1.6.0.4-1ubuntu2 [425kB]
-Get:7 http://us.archive.ubuntu.com jaunty/main gitk 1:1.6.0.4-1ubuntu2 [318kB]
-Fetched 4074kB in 1min 12s (56.6kB/s)
-Selecting previously deselected package git-core.
-(Reading database ... 121308 files and directories currently installed.)
-Unpacking git-core (from .../git-core_1%3a1.6.0.4-1ubuntu2_i386.deb) ...
-Selecting previously deselected package git-doc.
-Unpacking git-doc (from .../git-doc_1%3a1.6.0.4-1ubuntu2_all.deb) ...
-Selecting previously deselected package tcl8.4.
-Unpacking tcl8.4 (from .../tcl8.4_8.4.19-2_i386.deb) ...
-Selecting previously deselected package tcl.
-Unpacking tcl (from .../archives/tcl_8.4.16-2_all.deb) ...
-Selecting previously deselected package tk8.4.
-Unpacking tk8.4 (from .../tk8.4_8.4.19-2_i386.deb) ...
-Selecting previously deselected package tk.
-Unpacking tk (from .../archives/tk_8.4.16-2_all.deb) ...
-Selecting previously deselected package git-gui.
-Unpacking git-gui (from .../git-gui_1%3a1.6.0.4-1ubuntu2_all.deb) ...
-Selecting previously deselected package gitk.
-Unpacking gitk (from .../gitk_1%3a1.6.0.4-1ubuntu2_all.deb) ...
-Processing triggers for man-db ...
-Setting up git-core (1:1.6.0.4-1ubuntu2) ...
-Setting up git-doc (1:1.6.0.4-1ubuntu2) ...
-Setting up tcl8.4 (8.4.19-2) ...
-
-Setting up tcl (8.4.16-2) ...
-
-Setting up tk8.4 (8.4.19-2) ...
-
-Setting up tk (8.4.16-2) ...
-
-Setting up git-gui (1:1.6.0.4-1ubuntu2) ...
-Setting up gitk (1:1.6.0.4-1ubuntu2) ...
-Processing triggers for libc6 ...
-ldconfig deferred processing now taking place
+ diff --git a/_posts/2009-06-14-mac-git-installation.markdown b/_posts/2009-06-14-mac-git-installation.markdown index 853929d..a63a7c8 100644 --- a/_posts/2009-06-14-mac-git-installation.markdown +++ b/_posts/2009-06-14-mac-git-installation.markdown @@ -2,36 +2,10 @@ layout: default title: Installing git (OSX) description: How to install git on OSX -categories: mac -main_category: setup --- -There are a number of methods to install git on OSX. This guide details the most common methods, in order of ease of install. +This page has moved. If the redirect fails, [click me](mac-set-up-git) -After you have completed installation you will need to [generate an SSH keypair](/mac-key-setup) and [set your local git config](/git-email-settings). - -Pre-compiled Installer ----------------------- - -Download and run [git-osx-installer](http://code.google.com/p/git-osx-installer/) - -Homebrew --------- - -Install [Homebrew](http://github.com/mxcl/homebrew) if you haven't already done so. - -Install Git *(You may want to include Subversion support if you want to import SVN repositories. Snow Leopard already contains a copy of SVN)* - - $ brew install git - ==> Downloading http://kernel.org/pub/software/scm/git/git-1.6.5.7.tar.bz2 - ######################################################################## 100.0% - ==> ./configure --prefix=/usr/local/Cellar/git/1.6.5.7 - ==> make install - ==> Downloading http://kernel.org/pub/software/scm/git/git-manpages-1.6.5.7.tar.bz2 - ######################################################################## 100.0% - /usr/local/Cellar/git/1.6.5.7: 383 files, 16M, built in 74 seconds - -Compiling git manually ----------------------- - -See [this guide](http://gist.github.com/423308). + diff --git a/_posts/2009-06-14-win-git-installation.markdown b/_posts/2009-06-14-win-git-installation.markdown index 7d9c87a..4e618f4 100644 --- a/_posts/2009-06-14-win-git-installation.markdown +++ b/_posts/2009-06-14-win-git-installation.markdown @@ -2,24 +2,10 @@ layout: default title: Installing git (Win/msysgit) description: How to install git on Windows -categories: windows -main_category: setup --- -Installing git on windows is a fairly straightforward process. To begin, download the latest version of [msysgit](http://code.google.com/p/msysgit/). +This page has moved. If the redirect fails, [click me](win-set-up-git) -_This guide was written with Git-1.6.5.1-preview20091022.exe, newer versions may differ._ - -For each step we will use the default options. It is advisable that you do not use PuTTY if the installer gives you that option. GitHub only provides support for openssh. - -After you have completed installation you will need to [generate an SSH keypair](/msysgit-key-setup) and [set your local git config](/git-email-settings). - -![Welcome](http://img.skitch.com/20100125-fndn896jf6rfj5cs6nfhj9bxiq.jpg) -![License](http://img.skitch.com/20100125-dmx43twyjrrksdmn76pcj3prdi.jpg) -![Path](http://img.skitch.com/20100125-tepu9jhdnq5yh5a5ecdrtwxibm.jpg) -![Start menu](http://img.skitch.com/20100125-ju7te2wr8hus7u7c1beghxpd9h.jpg) -![Shortcuts](http://img.skitch.com/20100125-g5rpq18d1jryg2bhg72urypd2j.jpg) -![PATH](http://img.skitch.com/20100125-d3urje18fhhf5b99st6yyypp6w.jpg) -![CRLF](http://img.skitch.com/20100125-k3g1yeru3af1u31r5bu9b5t7xt.jpg) -![Installin'](http://img.skitch.com/20100125-knmcqg7d9dqsxbk13iityyrxji.jpg) -![Finished](http://img.skitch.com/20100125-q1tjy72n1tk1c191fdfp9jkspg.jpg) \ No newline at end of file + diff --git a/_posts/2009-06-15-key-setup-redirect.textile b/_posts/2009-06-15-key-setup-redirect.markdown similarity index 56% rename from _posts/2009-06-15-key-setup-redirect.textile rename to _posts/2009-06-15-key-setup-redirect.markdown index 29b7428..45e7327 100644 --- a/_posts/2009-06-15-key-setup-redirect.textile +++ b/_posts/2009-06-15-key-setup-redirect.markdown @@ -2,18 +2,17 @@ layout: default title: Generating SSH keys description: How to generate SSH keys and add them to GitHub -categories: setup popular -main_category: setup --- Attempting to redirect to the guide for your OS. If the redirect fails, pick your OS: -* "Windows":msysgit-key-setup -* "Mac":mac-key-setup -* "Linux":linux-key-setup +* [Windows](win-set-up-git) +* [Mac](mac-set-up-git) +* [Linux](linux-set-up-git) \ No newline at end of file + if (navigator.appVersion.indexOf("Win") != -1) {window.location = '/win-set-up-git'} + else if (navigator.appVersion.indexOf("Mac") != -1) {window.location = '/mac-set-up-git'} + else if (navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) {window.location = '/linux-set-up-git'} + +> \ No newline at end of file diff --git a/_posts/2009-06-15-linux-key-setup.textile b/_posts/2009-06-15-linux-key-setup.markdown similarity index 100% rename from _posts/2009-06-15-linux-key-setup.textile rename to _posts/2009-06-15-linux-key-setup.markdown diff --git a/_posts/2009-06-15-mac-key-setup.textile b/_posts/2009-06-15-mac-key-setup.markdown similarity index 100% rename from _posts/2009-06-15-mac-key-setup.textile rename to _posts/2009-06-15-mac-key-setup.markdown diff --git a/_posts/2009-06-15-msysgit-key-setup.markdown b/_posts/2009-06-15-msysgit-key-setup.markdown new file mode 100644 index 0000000..70f340f --- /dev/null +++ b/_posts/2009-06-15-msysgit-key-setup.markdown @@ -0,0 +1,11 @@ +--- +layout: default +title: Generating SSH keys (Win/msysgit) +description: Setting up SSH keys with msysgit on Windows +--- + +This page has moved. If the redirect fails, [click me](win-set-up-git) + + diff --git a/_posts/2009-06-15-msysgit-key-setup.textile b/_posts/2009-06-15-msysgit-key-setup.textile deleted file mode 100644 index 45efa09..0000000 --- a/_posts/2009-06-15-msysgit-key-setup.textile +++ /dev/null @@ -1,70 +0,0 @@ ---- -layout: default -title: Generating SSH keys (Win/msysgit) -description: Setting up SSH keys with msysgit on Windows -categories: windows -main_category: setup ---- - -This guide will step you through the process of generating a keypair in msysgit and uploading it to GitHub - -Generating an SSH key with msysgit is a fairly straightforward process. First and foremost, make sure you're working in the Git Bash console, not cmd (the default Windows command line). You can find Git Bash under the git folder in your start menu, or by right clicking on a folder and selecting "Git Bash Here" if you choose to install context menu items during the msysgit installation. - -h2. Backup and remove existing keys - -Unless this is your first time installing msys on your computer, you should double check that keys do not already exist. If they do you can either use the existing key(s) or remove them. In either case, you should make a backup of the keys. - -First check to see if a ssh key directory exists. - -
$ cd ~/.ssh
- -If you get a "No such file or directory" error, you can skip to "Generating a key". - -
$ ls
-config  id_rsa  id_rsa.pub  known_hosts
-$ mkdir key_backup
-$ cp id_rsa* key_backup
-$ rm id_rsa*
- -Here we have an existing keypair, @id_rsa@ and @id_rsa.pub@, which we've copied into @~/.ssh/key_backup@ before removing. By default, ssh will use keys in @~/.ssh@ that are named @id_rsa@, @id_dsa@ or @identity@. - -h2. Generating a key - -p(. _If you have an existing keypair you wish to use, you can skip this step._ - -Now that we're certain ssh won't use an existing key, it's time to generate a new keypair. Let's make an RSA keypair: - -
$ ssh-keygen -t rsa -C "tekkub@gmail.com"
-Generating public/private rsa key pair.
-Enter file in which to save the key (/c/Users/Tekkub/.ssh/id_rsa):
-Enter passphrase (empty for no passphrase):
-Enter same passphrase again:
-Your identification has been saved in /c/Users/Tekkub/.ssh/id_rsa.
-Your public key has been saved in /c/Users/Tekkub/.ssh/id_rsa.pub.
-The key fingerprint is:
-e8:ae:60:8f:38:c2:98:1d:6d:84:60:8c:9e:dd:47:81 tekkub@gmail.com
- -At the first prompt you can just hit enter to generate the key with the default name. *You should use a good passphrase with your key.* See "Working with SSH key passphrases":/working-with-key-passphrases for more details on why you should use a passphrase and how to avoid re-entering it every time you use your key. - -h2. Adding the key to your GitHub account - -Now launch your browser and open the "account page":https://github.com/account. In the "SSH Public Keys" section click "add another public key", then paste your key into the "key" field. If you leave the title blank the key comment (your email) will be used for the title. - -Make sure you use the public key (@id_rsa.pub@ in our example), and do not add any newlines or whitespace inside the key. - -!/images/add_key.png! - -h2. Testing things out - -Testing if our new key works is simple, we just ssh to github. If this is the first time you're connecting you'll have to save the server's key. You can confirm the fingerprint on the SSH keys tab of the "account settings page":https://github.com/account - -
$ ssh git@github.com
-The authenticity of host 'github.com (207.97.227.239)' can't be established.
-RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48.
-Are you sure you want to continue connecting (yes/no)? yes
-Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts.
-ERROR: Hi tekkub! You've successfully authenticated, but GitHub does not provide shell access
-Connection to github.com closed.
-
- -If you do not get the "successfully authenticated" message, check out the "troubleshooting guide":http://github.com/guides/addressing-authentication-problems-with-ssh. From 83e21e296d6498478cbf01d01bfa7dbfcc451bcf Mon Sep 17 00:00:00 2001 From: tekkub Date: Wed, 2 Mar 2011 00:32:08 -0700 Subject: [PATCH 006/247] Another redirect --- _posts/2009-06-11-forking.markdown | 95 ++------------------------ _posts/2011-02-17-fork-a-repo.markdown | 2 +- 2 files changed, 5 insertions(+), 92 deletions(-) diff --git a/_posts/2009-06-11-forking.markdown b/_posts/2009-06-11-forking.markdown index 5c472df..bb06e35 100755 --- a/_posts/2009-06-11-forking.markdown +++ b/_posts/2009-06-11-forking.markdown @@ -2,97 +2,10 @@ layout: default title: Forking a project description: How to fork a project, submit changes, and pull from other repos in the fork network -categories: collaborating popular -main_category: collaborating --- -This guide will step you through the process of forking, pushing your changes, -and pulling in changes from the upstream repo. +This page has moved. If the redirect fails, [click me](fork-a-repo) -We'll use [github-services](http://github.com/github/github-services) as an -example to fork, submit a change, and re-sync with the forked repo. - -All of the examples on this page assume you're working in the `master` branch. - -Note that this works for pulling from a forked repository to the original as well. - -Setting up ----------- - -First, create your fork. Click the *Fork* button on the project's page. You -will be presented with the information for your newly forked repository: - -![Fork you](http://img.skitch.com/20100125-8tykuy41tn39emcbsrxy545e9f.jpg) - -Now clone the fork locally. Make sure you use the *Private URL*, __not__ the -*Public URL*. - -
$ git clone git@github.com:billyanyteen/github-services.git
- -Once the clone is complete your repo will have a remote named "origin" that -points to your fork on github. Don't let the name confuse you, this __does -not__ point to the original repo you forked from. To help you keep track of -that repo we will add another remote named "upstream": - -
$ cd github-services
-$ git remote add upstream git://github.com/github/github-services.git
-$ git fetch upstream
-
- -Note that we used the public clone URL for upstream, so we can't push changes -directly to it. We probably don't have permission to do that anyway, which is -why we're creating a fork in the first place. If the upstream repo is private, -you must use its private URL. - -Pushing your changes --------------------- - -Now that we've got our fork, we need to make a few changes and commit them -locally. Once you've done this, it's time to push your updated branch: - -
$ git push origin master
- -Once you've pushed your commit(s), inform the project owner of the changes so -they can pull them into their repo. The best way to do this is by [sending a -pull request](/pull-requests/). - -Pulling in upstream changes ---------------------------- - -Some time has passed, the upstream repo has changed and you want to update your -fork before you submit a new patch. There are two ways to do this: - -
$ git fetch upstream
-$ git merge upstream/master
- -
$ git pull upstream master
- -`git pull` is a more direct way, but the merge it performs can be confusing if -the user doesn't expect it and a merge conflict results. `git fetch` will also -grab all branches, where `git pull` grabs only the one specified. - -If you have local commits that are not in the upstream branch, a normal merge -will occur. If your local commits are in the upstream branch, a fast-forward -merge will be done, moving your local branch to the same commit as -upstream/master. If both repos have edits to the same location in the same -file, you may run into a merge conflict. Conflicts must be resolved by hand and -a commit made to complete the merge. - -Now that your local branch has been updated, commit your changes, push, and -[send a pull request](/pull-requests/). - -You may wish to do the fetch and merge manually, instead of letting git-pull do -it for you. This can help avoid headaches caused by mysterious merge conflicts. - -Deleting the forked repository ------------------------------- - -To remove the fork, delete it like any repo: click the *Admin* button, then the -*Delete This Repository…* button. - -Additional resources --------------------- - -* [hub](http://github.com/defunkt/hub) -* [github-gem](http://github.com/defunkt/github-gem) -* [Rails on the Run forking tutorial](http://railsontherun.com/2008/3/3/how-to-use-github-and-submit-a-patch) + diff --git a/_posts/2011-02-17-fork-a-repo.markdown b/_posts/2011-02-17-fork-a-repo.markdown index 507390d..433d7e8 100644 --- a/_posts/2011-02-17-fork-a-repo.markdown +++ b/_posts/2011-02-17-fork-a-repo.markdown @@ -2,7 +2,7 @@ layout: default title: Fork A Repo description: Copy a repo to create a new, unique project from its contents. -categories: bootcamp +categories: bootcamp collaborating main_category: bootcamp --- From f0fd19757ee78ebdb72e85dcdf3c6fadbb36181a Mon Sep 17 00:00:00 2001 From: tekkub Date: Wed, 2 Mar 2011 00:52:54 -0700 Subject: [PATCH 007/247] another rename for ordering --- ...rkdown => 2009-06-13-fork-a-repo.markdown} | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) rename _posts/{2011-02-17-fork-a-repo.markdown => 2009-06-13-fork-a-repo.markdown} (99%) diff --git a/_posts/2011-02-17-fork-a-repo.markdown b/_posts/2009-06-13-fork-a-repo.markdown similarity index 99% rename from _posts/2011-02-17-fork-a-repo.markdown rename to _posts/2009-06-13-fork-a-repo.markdown index 433d7e8..e6bf305 100644 --- a/_posts/2011-02-17-fork-a-repo.markdown +++ b/_posts/2009-06-13-fork-a-repo.markdown @@ -15,7 +15,7 @@ At some point you may find yourself wanting to contribute to someone else's proj 1. Fork the “Spoon-Knife ” repo To fork this project, click the “Fork” button. - + Click “Fork ##Next: Set Up Your Local Repo @@ -25,7 +25,7 @@ You’ve successfully forked the Spoon-Knife repo, but so far it only exists 1. Clone the “Spoon-Knife” project Run the following code: - +
 	$ git clone git@github.com:username/Spoon-Knife.gitClones your copy of the repo into the current directory in terminal
 	
@@ -33,7 +33,7 @@ You’ve successfully forked the Spoon-Knife repo, but so far it only exists 2. Configure remotes When clone a repo, it has a default remote called `origin` that points to your fork on GitHub, not the original repo it was forked from. To keep track of the original repo, you need to add another remote named `upstream`: - +

More about remotes

@@ -45,7 +45,7 @@ You’ve successfully forked the Spoon-Knife repo, but so far it only exists

- +
 	$ cd Spoon-KnifeChanges the active directory in the prompt to the newly cloned "Spoon-Knife" directory
 	$ git remote add upstream git://github.com/octocat/Spoon-Knife.gitAssigns the original repo to a remote called "upstream"
@@ -59,7 +59,7 @@ You’ve successfully forked a repo, but get a load of these other cool thin
 - Push commits
 
 	Once you’ve made some commits to a forked repo and want to push it to your forked project, you do it the same way you would with a regular repo:
-	
+
 	

More about commits

@@ -68,7 +68,7 @@ You’ve successfully forked a repo, but get a load of these other cool thin

- +
 	$ git push origin masterPushes commits to your remote repo stored on GitHub
 	
@@ -76,12 +76,12 @@ You’ve successfully forked a repo, but get a load of these other cool thin - Pull in upstream changes If the original repo you forked your project from gets updated, you can add those updates to your fork by running the following code: - +
 	$ git fetch upstreamFetches any new changes from the original repo
 	$ git merge upstream/masterMerges any changes fetched into your working files
 	
- +

What is the difference between fetch and pull?

@@ -93,7 +93,7 @@ You’ve successfully forked a repo, but get a load of these other cool thin $ git pull upstreamPulls commits from 'upstream' and adds them to the local repo

When you use pull, Git tries to automatically do your work for you. It is context sensitive, so Git will merge any pulled commits into the branch you are currently working in. One thing to keep in mind is that pull automatically merges the commits without letting you review them first. If you don’t closely manage your branches you may run into frequent conflicts.

- +

Fetch/Merge

 					$ git fetch upstreamFetches any new commits from the original repo
@@ -102,49 +102,49 @@ You’ve successfully forked a repo, but get a load of these other cool thin
 			

When you fetch, Git gathers any commits from the target branch that do not exist in your current branch and stores them in your local repo. However, it does not merge them with your current branch. This is particularly useful if you need to keep your repo up to date but are working on something that might break if you update your files. To integrate the commits into your master branch, you use merge. This combines the specified branches and prompts you if there are any conflicts.

- + - Work with branches Branching allows you to build new features or test out ideas without putting your main project at risk. A Git branch is a small file that references the commit it was spawned from. This makes Git branches very small and easy to work with. - +

How do I use branches?

- +

Branches are pretty easy to work with and will save you a lot of headaches, especially when working with multiple people. To create a branch and begin working in it, use the following script:

- +
 				$ git branch mybranchCreates a new branch called "mybranch"
 				$ git checkout mybranchMakes "mybranch" the active branch
 			
- +

Alternatively, you can use the shortcut:

- +
 				$ git checkout -b mybranchCreates a new branch called "mybranch" and makes it the active branch
 			
- +

To switch between branches, use checkout.

- +
 				$ git checkout masterMakes "master" the active branch
 				$ git checkout mybranchMakes "mybranch" the active branch
 			
- +

Once you’re finished working on your branch and are ready to combine it back into the master branch, use merge.

- +
 				$ git checkout masterMakes "master" the active branch
 				$ git merge mybranchMerges the commits from "mybranch" into "master"
 				$ git branch -d mybranchDeletes the "mybranch" branch
 			
- +
- + - Pull requests If you are hoping to contribute back to the original fork, you can send the original author a [pull request](/pull-requests/). @@ -158,4 +158,4 @@ You have now created forked a repo. What do you want to do next?
  • Create A Repository
  • Fork A Repository
  • Be Social
  • - \ No newline at end of file + \ No newline at end of file From ae32d89e9741d94143907f3d151d1eb92f23ebd9 Mon Sep 17 00:00:00 2001 From: tekkub Date: Wed, 2 Mar 2011 00:53:19 -0700 Subject: [PATCH 008/247] Pull requests aren't sent to specific people anymore, huzzah! --- index.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.markdown b/index.markdown index fa39911..9b5470d 100644 --- a/index.markdown +++ b/index.markdown @@ -7,13 +7,13 @@ Welcome to the GitHub Help site. Here we have compiled many guides to help you s Use the sidebar on the right side of this site to access our guides! -If you would like to submit your own guides, please fork [our repo](http://github.com/github/help.github.com/) and send pull requests to [tekkub](http://github.com/tekkub) +If you would like to submit your own guides, please fork [our repo](http://github.com/github/help.github.com/) and send a pull request. GitHub Bootcamp ------------------------------------ +--------------- -If you are still new to things, we’ve provided a few walkthroughs to get you started: +If you are still new to things, we've provided a few walkthroughs to get you started: 1. Take a quick [crash course](http://gitref.org/) on git 2. [Set up git](set-up-git-redirect) From 414ec0955a0e569b06262cdb7ad92e19c0717cc5 Mon Sep 17 00:00:00 2001 From: tekkub Date: Wed, 2 Mar 2011 00:54:14 -0700 Subject: [PATCH 009/247] Shuffle some categories around --- _layouts/default.html | 1 - _posts/2009-06-17-troubleshooting-ssh.textile | 2 +- _posts/2009-06-20-git-email-settings.textile | 3 +-- _posts/2009-09-03-working-with-key-passphrases.textile | 2 +- _posts/2009-10-05-dealing-with-lineendings.textile | 2 +- _posts/2010-01-19-managing-clients.markdown | 3 +-- _posts/2010-06-02-svn-importing.markdown | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index 8623b43..7c7dd4e 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,7 +1,6 @@ --- sidebar_cats: - bootcamp -- setup - troubleshooting - repos - collaborating diff --git a/_posts/2009-06-17-troubleshooting-ssh.textile b/_posts/2009-06-17-troubleshooting-ssh.textile index dcad159..8900a78 100644 --- a/_posts/2009-06-17-troubleshooting-ssh.textile +++ b/_posts/2009-06-17-troubleshooting-ssh.textile @@ -2,7 +2,7 @@ layout: default title: Troubleshooting SSH issues description: Solutions to common SSH issues -categories: setup troubleshooting popular +categories: troubleshooting popular main_category: troubleshooting --- diff --git a/_posts/2009-06-20-git-email-settings.textile b/_posts/2009-06-20-git-email-settings.textile index 11abe29..105f7c4 100644 --- a/_posts/2009-06-20-git-email-settings.textile +++ b/_posts/2009-06-20-git-email-settings.textile @@ -2,8 +2,7 @@ layout: default title: Setting user name, email and GitHub token description: Configure your local git installation so that commits are linked to your GitHub account -categories: setup popular -main_category: setup +categories: troubleshooting popular --- This guide covers basic git settings you should set before making any commits. diff --git a/_posts/2009-09-03-working-with-key-passphrases.textile b/_posts/2009-09-03-working-with-key-passphrases.textile index c168c84..1685267 100644 --- a/_posts/2009-09-03-working-with-key-passphrases.textile +++ b/_posts/2009-09-03-working-with-key-passphrases.textile @@ -2,7 +2,7 @@ layout: default title: Working with SSH key passphrases description: SSH key passphrases, why you should use them, and how to avoid re-entering them -categories: windows mac setup +categories: windows mac troubleshooting main_category: setup --- diff --git a/_posts/2009-10-05-dealing-with-lineendings.textile b/_posts/2009-10-05-dealing-with-lineendings.textile index 52879be..6d7e3f1 100644 --- a/_posts/2009-10-05-dealing-with-lineendings.textile +++ b/_posts/2009-10-05-dealing-with-lineendings.textile @@ -2,7 +2,7 @@ layout: default title: Dealing with line endings description: How to ensure that line endings are consistent in your repo -categories: setup windows mac linux +categories: troubleshooting windows mac linux main_category: windows --- diff --git a/_posts/2010-01-19-managing-clients.markdown b/_posts/2010-01-19-managing-clients.markdown index ea29349..1f0a267 100644 --- a/_posts/2010-01-19-managing-clients.markdown +++ b/_posts/2010-01-19-managing-clients.markdown @@ -2,8 +2,7 @@ layout: default title: Managing multiple clients description: How to manage multiple clients and their repositories -categories: collaborating setup -main_category: setup +categories: collaborating --- Are you a freelance developer working on multiple projects for multiple clients, and want to manage them here on GitHub? Never fear, this guide will detail the most common solutions to this problem diff --git a/_posts/2010-06-02-svn-importing.markdown b/_posts/2010-06-02-svn-importing.markdown index 328be22..b5506ea 100644 --- a/_posts/2010-06-02-svn-importing.markdown +++ b/_posts/2010-06-02-svn-importing.markdown @@ -1,7 +1,7 @@ --- layout: default title: Importing from Subversion -categories: setup +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: From d84b1403119a302d02f97034c47ee38a1dcdddeb Mon Sep 17 00:00:00 2001 From: tekkub Date: Wed, 2 Mar 2011 00:56:52 -0700 Subject: [PATCH 010/247] main_category isn't used anymore --- _layouts/default.html | 7 ------- _posts/2009-06-13-fork-a-repo.markdown | 1 - _posts/2009-06-15-linux-key-setup.markdown | 1 - _posts/2009-06-15-mac-key-setup.markdown | 1 - _posts/2009-06-16-troubleshooting-common-issues.markdown | 1 - _posts/2009-09-03-working-with-key-passphrases.textile | 1 - _posts/2009-10-05-dealing-with-lineendings.textile | 1 - _posts/2009-11-17-testing-webhooks.textile | 1 - _posts/2010-08-29-pull-requests.md | 1 - _posts/2011-02-15-set-up-git-redirect.markdown | 1 - _posts/2011-02-16-create-a-repo.markdown | 1 - _posts/2011-02-18-be-social.markdown | 1 - 12 files changed, 18 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index 7c7dd4e..fe8d78b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -27,13 +27,6 @@ - {% if page.main_category %} - - {% else %} - {% if page.categories %} - - {% endif %} - {% endif %}
    +#### Auto Merge + +In many cases it is possible to ask github to auto merge a pull request using +the merge button. This was made possible with the launch of Pull Requests 2.0 +and is covered in the [related blog post](https://github.com/blog/843-the-merge-button). + ## Closing a Pull Request Pull Requests are automatically closed when the requested commits are merged From 4e9c4c8ca65dd32a4616cc3711f8d24927341139 Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Fri, 27 May 2011 08:25:04 -0700 Subject: [PATCH 077/247] Adding new categories. --- _layouts/default.html | 17 +++++++---------- _posts/2008-02-15-set-up-git-redirect.markdown | 2 +- _posts/2008-02-16-create-a-repo.markdown | 2 +- _posts/2009-06-13-fork-a-repo.markdown | 2 +- _posts/2009-06-13-linux-set-up-git.markdown | 1 - _posts/2009-06-13-mac-set-up-git.markdown | 1 - _posts/2009-06-13-win-set-up-git.markdown | 1 - _posts/2009-06-24-creating-a-repo.markdown | 2 +- _posts/2009-06-25-deleting-a-repo.markdown | 2 +- _posts/2009-06-25-moving-a-repo.markdown | 2 +- _posts/2009-07-04-git-html-help.markdown | 2 +- ...9-09-03-working-with-key-passphrases.textile | 2 +- 12 files changed, 15 insertions(+), 21 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index 67a0c67..70a6455 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,18 +1,15 @@ --- sidebar_cats: -- bootcamp +- beginner +- intermediate +- advanced - troubleshooting -- repos -- collaborating -- everyday_git -- git_ninjutsu -- deploying -- mac -- windows -- linux -- other +- third_party +- github_resources +- git_resources - site_policy --- + diff --git a/_posts/2008-02-15-set-up-git-redirect.markdown b/_posts/2008-02-15-set-up-git-redirect.markdown index c8d5858..afecf45 100644 --- a/_posts/2008-02-15-set-up-git-redirect.markdown +++ b/_posts/2008-02-15-set-up-git-redirect.markdown @@ -2,7 +2,7 @@ layout: os_redirect title: Set Up Git description: A quick guide to help you get started with Git -categories: bootcamp +categories: beginner redirect_win: /win-set-up-git redirect_mac: /mac-set-up-git redirect_linux: /linux-set-up-git diff --git a/_posts/2008-02-16-create-a-repo.markdown b/_posts/2008-02-16-create-a-repo.markdown index d15501a..f10d79e 100644 --- a/_posts/2008-02-16-create-a-repo.markdown +++ b/_posts/2008-02-16-create-a-repo.markdown @@ -2,7 +2,7 @@ layout: default title: Create A Repo description: Create the place where your commits will be stored -categories: bootcamp +categories: beginner --- If you’ve found yourself on this page, we’re assuming you’re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way. diff --git a/_posts/2009-06-13-fork-a-repo.markdown b/_posts/2009-06-13-fork-a-repo.markdown index 8e8d3e1..eccf8df 100644 --- a/_posts/2009-06-13-fork-a-repo.markdown +++ b/_posts/2009-06-13-fork-a-repo.markdown @@ -2,7 +2,7 @@ layout: default title: Fork A Repo description: Copy a repo to create a new, unique project from its contents. -categories: bootcamp collaborating +categories: beginner --- If you’ve found yourself on this page, we’re assuming you’re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way. diff --git a/_posts/2009-06-13-linux-set-up-git.markdown b/_posts/2009-06-13-linux-set-up-git.markdown index b1968d4..474df21 100644 --- a/_posts/2009-06-13-linux-set-up-git.markdown +++ b/_posts/2009-06-13-linux-set-up-git.markdown @@ -2,7 +2,6 @@ layout: default title: Set Up Git (Linux) description: A quick guide to help you get started with Git -categories: linux --- If you’ve found yourself on this page, we’re assuming you’re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way. diff --git a/_posts/2009-06-13-mac-set-up-git.markdown b/_posts/2009-06-13-mac-set-up-git.markdown index ab060ad..bf270d5 100644 --- a/_posts/2009-06-13-mac-set-up-git.markdown +++ b/_posts/2009-06-13-mac-set-up-git.markdown @@ -2,7 +2,6 @@ layout: default title: Set Up Git (OSX) description: A quick guide to help you get started with Git -categories: mac --- If you’ve found yourself on this page, we’re assuming you’re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way. diff --git a/_posts/2009-06-13-win-set-up-git.markdown b/_posts/2009-06-13-win-set-up-git.markdown index 58310d1..91e6bd2 100644 --- a/_posts/2009-06-13-win-set-up-git.markdown +++ b/_posts/2009-06-13-win-set-up-git.markdown @@ -2,7 +2,6 @@ layout: default title: Set Up Git (Windows) description: A quick guide to help you get started with Git -categories: windows --- If you’ve found yourself on this page, we’re assuming you’re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way. diff --git a/_posts/2009-06-24-creating-a-repo.markdown b/_posts/2009-06-24-creating-a-repo.markdown index 515e4c2..98e3d64 100644 --- a/_posts/2009-06-24-creating-a-repo.markdown +++ b/_posts/2009-06-24-creating-a-repo.markdown @@ -2,7 +2,7 @@ layout: default title: Creating a repo description: How to create a new repo on GitHub -categories: repos +redirect_to: /create-a-repo --- Creating a new repo is a simple process. Log in and go to the [dashboard](https://github.com/). diff --git a/_posts/2009-06-25-deleting-a-repo.markdown b/_posts/2009-06-25-deleting-a-repo.markdown index 3b67373..05da252 100644 --- a/_posts/2009-06-25-deleting-a-repo.markdown +++ b/_posts/2009-06-25-deleting-a-repo.markdown @@ -2,7 +2,7 @@ layout: default title: Deleting a repo description: How to remove a repo from your GitHub account -categories: repos +categories: beginner ---

    Deleting a private repo will delete all forks of the repo. Deleting a public repo will not.

    diff --git a/_posts/2009-06-25-moving-a-repo.markdown b/_posts/2009-06-25-moving-a-repo.markdown index dd60665..3f33ac5 100644 --- a/_posts/2009-06-25-moving-a-repo.markdown +++ b/_posts/2009-06-25-moving-a-repo.markdown @@ -2,7 +2,7 @@ layout: default title: Moving a repo description: How to move a repo from one account to another -categories: repos +categories: beginner --- This guide details the process of moving a repo to another account. diff --git a/_posts/2009-07-04-git-html-help.markdown b/_posts/2009-07-04-git-html-help.markdown index d77d28f..6c268b0 100644 --- a/_posts/2009-07-04-git-html-help.markdown +++ b/_posts/2009-07-04-git-html-help.markdown @@ -2,7 +2,7 @@ layout: default title: Installing Git HTML help description: How to install the local git HTML help files -categories: other +categories: intermediate ---

    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.

    diff --git a/_posts/2009-09-03-working-with-key-passphrases.textile b/_posts/2009-09-03-working-with-key-passphrases.textile index e585983..8a0bfc6 100644 --- a/_posts/2009-09-03-working-with-key-passphrases.textile +++ b/_posts/2009-09-03-working-with-key-passphrases.textile @@ -2,7 +2,7 @@ layout: default title: Working with SSH key passphrases description: SSH key passphrases, why you should use them, and how to avoid re-entering them -categories: windows mac troubleshooting +categories: troubleshooting ---

    This guide will step you through the process of securing your ssh keys while avoiding re-entry of your passphrase every time you use the key.

    From 398c9cd6199c4873ca318af9f3f50ff4f62a1558 Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Fri, 27 May 2011 12:31:55 -0700 Subject: [PATCH 078/247] Update global styles to 58b228705822e1ce832e2b6b4f415cb8649bb96e --- _layouts/default.html | 26 ++++------ shared/css/documentation.css | 94 +++++++++++++++++++++------------- shared/images/footer_logo.png | Bin 0 -> 4430 bytes 3 files changed, 68 insertions(+), 52 deletions(-) create mode 100644 shared/images/footer_logo.png diff --git a/_layouts/default.html b/_layouts/default.html index 67a0c67..9dc7906 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -77,25 +77,19 @@

    {{ cat | replace:'_',' ' | capitalize }}