Providing your SSH Key

This guide has been moved to <a href="http://help.github.com/key-setup-redirect/">help.github.com</a>. You should be redirected momentarily. <script type="text/javascript"> window.location = 'http://help.github.com/key-setup-redirect/' </script> 2008-01-27T16:08:37-08:00 1 providing-your-ssh-key Providing your SSH Key

2009-09-03T20:59:17-07:00

706

<h2>Changing Your Origin</h2> If you were hosting your Git repo somewhere else before switching over to GitHub, you will need to change your origin so pushes will go to the new repo. <h2>Changing from repo.or.cz</h2> Many people might be coming from another popular public repository, <code>repo.or.cz</code>, so we'll use that as an example. You will need to edit your <code>.git/config</code> file to change the <code>url</code> variable to be the new repo. Where it used to be something like this: <pre> [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] url = git+ssh://repo.or.cz/srv/git/myproject.git fetch = +refs/heads/*:refs/remotes/origin/* push = refs/heads/master:refs/heads/master </pre> You will now have to change it to something like this: <pre> [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] url = git@github.com:username/myproject.git fetch = +refs/heads/*:refs/remotes/origin/* push = refs/heads/master:refs/heads/master </pre> <h2>Multi-Origin</h2> 'origin' is just a default name, there is no actual reason to use it - anything else can be used just as easily. In fact, it's often helpful to have many remotes that you can push to and/or pull from. Here is an alternate <code>.git/config</code> file that will allow you to push to either github or repo.or.cz as you wish. <pre> [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "public"] url = git+ssh://repo.or.cz/srv/git/myproject.git fetch = +refs/heads/*:refs/remotes/public/* push = refs/heads/master:refs/heads/master [remote "github"] url = git@github.com:username/myproject.git fetch = +refs/heads/*:refs/remotes/github/* push = refs/heads/*:refs/heads/* </pre> That will allow you to run this command to push to your repo.or.cz account: <pre class="console">~: git push public</pre> And this to push to your github account: <pre class="console">~: git push github</pre> 2008-01-27T17:00:30-08:00 2 changing-your-origin Changing Your Origin

2008-07-27T13:32:41-07:00

17276

<h2>Git/Rails Screencast</h2> <a href="http://www.vimeo.com/369095">Git with Rails Tutorial</a> The <a href="http://peepcode.com/products/git">PeepCode screencast</a>, naturally, is also high quality (though for a fee). Pragmatic Programmers offer the <a href="http://www.pragprog.com/screencasts/v-scgithub/insider-guide-to">Insider Guide to Github</a>- <a href="http://railscasts.com/episodes/96">Git on Rails</a> is a good introduction from Railscasts. <a href="http://www.gitcasts.com/">GitCasts</a>, if you like Railscasts, you’ll love this one too. <a href="http://www.teachmetocode.com/screencasts/5">Getting Started with GitHub</a>, walks through a basic first-run using GitHub via <a href="http://www.teachmetocode.com">TeachMeToCode.com</a> <h2>Git/Django Screencast</h2> Django more your style? Check out <a href="http://oebfare.com/blog/2008/jan/23/using-git-django-screencast/">Brian Rosner’s Git/Django screencast</a>. <h2>Google TechTalks</h2> <ul> <li><a href="http://video.google.com/videoplay?docid=-2199332044603874737">2007-05-04 – Linus Torvalds on Git</a> (Linus talks mainly about what Git is NOT as well as underlying general concepts such as distribution and integrity; he also shoots a lot of flames at developers and users of other SCM systems that he considers inferior. It is an entertaining talk.)</li> <li><a href="http://video.google.com/videoplay?docid=-3999952944619245780">2007-10-12 – Randal Schwartz on Git</a> (A good overview about what Git does and why it’s better than most other SCM systems; the specifics on how to use it get a bit lost because Randal is running out of time towards the end.)</li> </ul> <h2>Grails And Git QuickCast</h2> <a href="http://s3.amazonaws.com/g2onescreencasts/gitGrailsScreencast_web_final_compressed.mov">G2One Grails And Git QuickCast</a>, A short (11 minute) video demonstrating how Grails and Git can work together to support a really agile development process. This should be of general interest also, it is not very specific to Grails. 2008-01-28T04:07:49-08:00 4 git-screencasts Git Screencasts

2009-09-20T08:16:32-07:00

127266

<h4>Basics</h4> To prepare your project for Capistrano, go into the root directory of that project and type <pre class="console"> capify . </pre> <h4>Generate Public Key</h4> It would probably be a good idea to add a special user on your server(s) specifically for deployment. Once created, make sure to generate a public key for that SOB (see <a href="http://github.com/guides/providing-your-ssh-key">Providing Your SSH Key</a> ), and add it to your github account. You may also want to add your personal public key to this new user's <code>~/.ssh/authorized_keys</code> to ease deployment. N.B. GitHub doesn't allow the same public key to be assigned to more than one account. If you would like multiple users to be able to deploy from the same repo you'll probably want to add the deployer's public key as a Deploy Key for the repo in question. To do this make sure you're logged into GitHub as the repo administrator, edit the repo and go to the Admin tab. There you'll be able to add the deploy key. <h4>Settings</h4> Now for the fun part, configuring <a href="http://www.capify.org/">Capistrano</a>. Here are the 5 most notable Capistrano config options (found in deploy.rb): <pre class="console"> default_run_options[:pty] = true set :repository, "git@github.com:vanpelt/rails-app.git" set :scm, "git" set :scm_passphrase, "p@ssw0rd" #This is your custom users password set :user, "deployer" </pre> We need to turn on the <code>:pty</code> option because it would seem we don't get the passphrase prompt from git if we don't. Point the <code>:repository</code> option to your github clone URL. Set the <code>:passphrase</code> to the one you generated in the initial step, and set <code>:user</code> to the one you just created. If you're using your own private keys for git you might want to tell Capistrano to use agent forwarding with this command <pre class="console"> ssh_options[:forward_agent] = true </pre> <h4>Set Branch</h4> <pre class="console">set :branch, "origin/master"</pre> Or use the following line for newer versions of Capistrano: <pre class="console">set :branch, "master"</pre> This will specify the branch that gets checked out for the deployment. <blockquote> Older versions of git (e.g. 1.4.4.2) don't support -q on git checkout command. This will cause your deployment to fail by default. To fix either upgrade git or do: <code> set :scm_verbose, true </code> </blockquote> You may also wish to use one of the following options if your git repo is very large - otherwise each deploy will do a full repository clone every time. <h4>Remote Cache</h4> <pre class="console">set :deploy_via, :remote_cache</pre> Remote caching will keep a local git repo on the server you're deploying to and simply run a fetch from that rather than an entire clone. This is probably the best option and will only fetch the differences each deploy <h4>Shallow Clone</h4> <pre class="console">set :git_shallow_clone, 1</pre> Shallow cloning will do a clone each time, but will only get the first tree, not all the parents trees, too. This makes it a bit closer to how an svn checkout works, but be careful when using with the <code>set :branch</code> option, because it wont work unless the shallow clone number is big enough to encompass the branch you've specified. <h4>Submodules</h4> <pre class="console">set :git_enable_submodules, 1</pre> If you're using git's submodule support for edge rails or merb, set this guy to make sure the submodules "git" checked out. That's it folks, easy as pie. <h4>Migrating from SVN</h4> Migrating from SVN-based deploys? <a href="http://groups.google.com/group/github/browse_frm/thread/c5d2620c541e4e1a">Check this thread</a> if you run into any problems. <h4>Known Hosts List</h4> Note: the first time I tried to deploy, I got a failure, apparently because Capistrano wasn't prompting with this message: <pre class="console"> The authenticity of host 'github.com (65.74.177.129)' can't be established. RSA key fingerprint is .... Are you sure you want to continue connecting (yes/no)? yes Warning: Permanently added 'github.com,65.74.177.129' (RSA) to the list of known hosts. </pre> So I opened up a terminal separate from Capistrano and pulled my repo, added github.com to the list of known hosts. My next Cap deploy worked. 2008-01-29T11:21:12-08:00 5 deploying-with-capistrano Deploying with Capistrano

2009-06-27T15:38:00-07:00

92120

Got an idea? Use the <a href="http://github.com/contact">contact form</a> or <a href="http://support.github.com/">the support site</a> Looking for help? Try #github in irc.freenode.net or the <a href="http://groups.google.com/group/github/">Google Group</a>. Find a bug? Use the <a href="http://github.com/contact">contact form</a> or <a href="http://support.github.com/">the support site</a> 2008-01-31T10:41:38-08:00 7 feature-requests Feature Requests

2008-12-03T19:56:28-08:00

22282

<h3>Gitsplosion Podcast – links from <a href="http://github.com/blog/">GitHub blog</a> , <a href="http://feeds.feedburner.com/github">iTunes xml etc feed here</a></h3> <ul> <li><a href="http://tinyurl.com/6gj3ma">2008-06-24 – Gitsplosion! in iTunes</a></li> <li><a href="http://github.com/blog/95-gitsplosion-2">2008-06-20 – Gitsplosion #2</a></li> <li><a href="http://github.com/blog/86-gitsplosion">2008-06-12 – Gitsplosion #1</a></li> </ul> <h3>GitCasts – links from <a href="http://gitcasts.com/">GitCasts</a>, <a href="http://feeds.feedburner.com/GitcastsHighRes">HighResRSS</a></h3> <ul> <li><a href="http://gitcasts.com/posts/git-submodules">2008-06-23 – Git Submodules</a></li> <li><a href="http://gitcasts.com/posts/git-on-windows">2008-06-11 – Git on Windows</a></li> <li><a href="http://gitcasts.com/posts/railsconf-git-talk">2008-06-06 – RailsConf Git Talk</a></li> <li><a href="http://gitcasts.com/posts/empty-branches">2008-06-02 – Empty Branches</a></li> <li><a href="http://gitcasts.com/posts/distributed-workflow">2008-05-28 – Distributed Workflow</a></li> <li><a href="http://gitcasts.com/posts/rebasing">2008-05-28 – Rebasing</a></li> <li><a href="http://gitcasts.com/posts/branching-and-merging">2008-05-28 – Branching and Merging</a></li> <li><a href="http://gitcasts.com/posts/browsing-git-objects">2008-05-23 – Browsing Git Objects</a></li> <li><a href="http://gitcasts.com/posts/git-log">2008-05-19 – Git Log</a></li> <li><a href="http://gitcasts.com/posts/interactive-adding">2008-05-19 – Interactive Adding</a></li> <li><a href="http://gitcasts.com/posts/normal-workflow">2008-05-19 – Normal Workflow</a></li> <li><a href="http://gitcasts.com/posts/setup-initialization-and-cloning">2008-05-19 – Setup, Initialization and Cloning</a></li> </ul> <h3>Others</h3> <ul> <li><a href="http://peepcode.com/products/git">Git Peepcode</a></li> <li><a href="http://podcast.rubyonrails.com/programs/1/episodes/github-and-powerset">2008-06-13 – the Ruby on Rails Podcast: GitHub and Powerset</a></li> <li><a href="http://web20show.com/episodes/web20show-ep45-github">2008-06-13 – The Web 2.0 Show #45: GitHub</a></li> <li><a href="http://www.drunkandretired.com/2008/05/04/episode-123-i-finally-git-it/">2008-05-04 – DrunkAndRetired.com #123: I finally git it [with ‘KirinDave’]</a></li> <li><a href="http://www.drunkandretired.com/2008/04/17/episode-122-git-it-on/">2008-04-17 – DrunkAndRetired.com #122: Git it On!</a></li> <li><a href="http://www.hanselminutes.com/default.aspx?showID=126">2008-04-09 – Hanselminutes #108: Distributed Source Control with Git</a></li> <li><a href="http://railscasts.com/episodes/96">2008-03-10 – Railscasts.com #96: Git on Rails</a></li> <li><a href="http://blog.michaeltrier.com/2008/2/11/this-week-in-django-10-2008-02-10">2008-02-10 – ‘This Week in Django’</a></li> <li><a href="http://podcast.rubyonrails.com/programs/1/episodes/err-free">2008-01-30 – the Ruby on Rails Podcast: Err Free</a></li> <li><a href="http://twit.tv/floss19">2007-08-01 – FLOSS Weekly #19: git</a></li> </ul> 2008-02-11T15:24:45-08:00 8 git-podcasts Git Podcasts

2008-07-02T01:21:00-07:00

2720

2008-12-03T23:02:44-08:00

If you’re experiencing this problem on OSX, it’s likely caused by your MacPorts version of git. Macports compiles its packages’ source code after downloading standard source tarballs and running a MacPorts-specific patch against them. The git binary has been patched to use MacPorts’ own version of ssh (irrespective of your <code>$PATH</code> matching the OSX binaries) which, in turn, blows up git with the “fatal error”. The solution is to simply rename the <code>/opt/local/bin/ssh</code> and <code>/opt/local/bin/scp</code> binaries and then replace them with a symlink which points to the OSX-supplied version. Here’s how: <pre class="console">$ sudo -s # To get a root prompt $ cd /opt/local/bin $ mv ssh{,_macports} $ mv scp{,_macports} $ ln -s /usr/bin/ssh ssh $ ln -s /usr/bin/scp scp</pre> <pre class="console">$ sudo -s # To get a root prompt $ cd /opt/local/bin $ mv ssh{,macports} $ mv scp{,macports} $ ln -s /usr/bin/ssh ssh $ ln -s /usr/bin/scp scp</pre> <notextile> This should fix it. Thanks to Jay Phillips for figuring this out. Note that this can also be fixed by specifying the IdentifyFile in your .ssh/config (see <a href="http://www.nabble.com/ssh%3A-percent_expand%3A-NULL-replacement-td13439207.html">here</a>) The "openssh 5.0p1_0+darwin_9" macport should solve the problem. Use the following commands to update OpenSSH: <pre class="console"> $ sudo port selfupdate $ sudo port upgrade openssh </pre> The “openssh 5.0p1_0+darwin_9” macport should solve the problem. Use the following commands to update OpenSSH: <pre class="console"> $ sudo port selfupdate $ sudo port upgrade openssh </pre> <notextile> <hr/> For those of us who compiled git from source, I got this error with git 1.5.6.4, but it went away when I upgraded to 1.6.0. 2008-02-13T12:22:11-08:00 10 percent_expand-null-replacement-bug 'percent_expand: NULL replacement' Bug

2008-12-19T07:33:38-08:00

18606

<h1>Let GitHub do it for you</h1> GitHub can directly import SVN projects. All you’ll need is the repository URL. More details are in the <a href="http://github.com/blog/156-subversion-importing">blog article</a> that introduced the feature. Note: GitHub does not keep imported projects synchronized with the SVN repo. <h1>Do it yourself</h1> <h2>svn2git</h2> <a href="http://github.com/nirvdrum/svn2git">svn2git</a> is designed to provide a complete svn import. Unlike git-svn, it will create proper git tags from your svn “tags”. Note: The current version of svn2git has GitHub support removed. <h2>git-svn</h2> <a href="http://www.kernel.org/pub/software/scm/git/docs/git-svn.html">git-svn</a> can be used to import as well. Note that there may be issues if you have branches or tags (they won’t be imported over). If you only have a trunk, like many svn repositories, this method should work for you without issue. First, be sure to <a href="http://github.com/repositories/new">create your repository on github</a> <pre class="console"> $ git svn clone -s SVN_REPO_URL LOCAL_DIR $ cd LOCAL_DIR $ git remote add origin git@github.com:GITHUB_USERNAME/REPO_NAME.git $ git push origin master</pre> Note that the -s switch implies that your svn repo is set up with the standard branches / tags / trunk structure. git-svn adds a note to every commit message it copies over from svn. To get rid of that note, add <code>--no-metadata</code> to the git svn clone command You can pull in later commits by running <code>git-svn rebase</code> from within your repo. (If you ever lose your local copy, just run the import again with the same settings, and you’ll get another working directory with all the necessary SVN metainfo.). <h3>Author mapping</h3> When migrating a Subversion repository to Git, you can map the Subversion users to Git users. You have to create an authors file which contains the mappings: <pre>fesplugas = Francesc Esplugas <fesplugas@intra….bles.net></pre> Then clone the subversion repository with the previously created <code>authors-file</code>: <pre class="console">$ git svn —authors-file=/home/fesplugas/.authors clone svn://intraducibles.net/var/svn/rails/plugins/something_fu something_fu</pre> <h2>Other guides</h2> <ul> <li><a href="http://www.simplisticcomplexity.com/2008/03/05/cleanly-migrate-your-subversion-repository-to-a-git-repository/">Guide by Jon Maddox</a> (doesn’t deal with branches)</li> <li><a href="http://www.fnokd.com/2008/08/20/mirroring-svn-repository-to-github">Guide by Bob McWhirter</a> (doesn’t deal with branches)</li> <li><a href="http://blog.woobling.org/2009/06/git-svn-abandon.html">Guide by Yuval Kogman</a></li> </ul> 2008-02-15T14:36:04-08:00 11 import-from-subversion Import from Subversion

2009-10-25T16:48:04-07:00

5364

This guide has been moved to <a href="http://help.github.com/post-receive-hooks/">help.github.com</a>. You should be redirected momentarily. <script type="text/javascript"> window.location = 'http://help.github.com/post-receive-hooks/' </script> 2008-02-15T16:33:09-08:00 12 post-receive-hooks Post-Receive Hooks

2009-10-16T19:45:35-07:00

706

This quick help will show you how to get a copy of your github repo down to a local computer. This would be a complete new copy, or clone. <ol> <li><a href="http://github.com/guides/providing-your-ssh-key">Add your SSH key</a> (and make sure ssh is <a href="http://github.com/guides/addressing-authentication-problems-with-ssh">configured to find your private key</a>)</li> <li>Copy your Clone URL from the repository homepage</li> <li>At the local computer go to directory that you want to contain your code</li> <li>Just enter the single command <code>git clone [clone_url]</code> where [clone_url] is something like <code>git@github.com:johndoe/myproject.git</code></li> </ol> 2008-02-16T22:09:42-08:00 13 getting-a-copy-of-your-github-repo Getting a copy of your github repo

2008-09-26T07:30:48-07:00

9205

Removing a branch from your remote repo is a little bit different from removing it locally. It’s all about the colon: <code>git push <remote_repo> :heads/<branch></code> Example: <code>git push origin :heads/some-branch</code> removes some-branch from the remote repo (apparently <code>git push origin :some-branch</code> works as well). This works for removing a tag as well: <code>git push origin :sometag</code> You might also want to check out <tt><a href="http://git-wt-commit.rubyforge.org/">git-publish-branch</a></tt>‘s ’<tt>-d</tt>’ option. <ul> <li>[[Push a branch to github]]</li> <li>[[Copy a remote branch]]</li> <li>[[Rename a remote branch]]</li> </ul> 2008-02-19T12:47:43-08:00 15 remove-a-remote-branch Remove a remote branch

2009-09-22T08:42:38-07:00

12496

Pull requests are a way to poke someone and let them know you’ve got some code they may want. They work great when you want to let an upstream maintainer know that you’ve pushed some useful changes to your fork of their project. They also work great if you want to let a fellow developer know that you’ve pushed some experimental features to an arbitrary branch. <h3>Step One</h3> First, navigate to your project with the changes you want someone else to pull. In this instance, I’m going to go to <a href="http://github.com/defunkt/grit">defunkt/grit</a> and tell mojombo to pull a change. <img src="http://img.skitch.com/20080223-xw8wdwkg9abpjtuwu4wutwwcqm.png"/> <h3>Step Two</h3> I can type in a message if I want and select any number of recipients. By default, I’ll see everyone who has a project in my project’s network. If I want to add someone else, I can use the autocompleter and click ‘add.’ <img src="http://img.skitch.com/20080223-1njj3f5559un2eyt51j92t2xkf.png"/> <h3>Step Three</h3> Sent! <img src="http://img.skitch.com/20080223-8jf2dc17cdtibs2jt13ptgxwts.png"/> <h3>Step Four</h3> When mojombo logs in, he’ll see that there’s a new message waiting for him. <img src="http://img.skitch.com/20080223-rpgh5c4e1n38wc3e45cacq77ww.png"/> <h3>Step Five</h3> <img src="http://img.skitch.com/20080223-p9erf1mhepf5gc7jy9kek9rgdn.png"/> mojombo can reply to my message, delete it, or ignore it. Pulling from me is easy. mojombo can add the defunkt repository as a remote source and fetch its contents like this: <pre class="console"> $ git remote add defunkt git://github.com/defunkt/grit.git $ git fetch defunkt </pre> The ‘git remote add’ will stay in your repository configuration, so the next time you get a pull request, you only need to fetch again. Note that to fetch from a private repository, you need to use the private update URL. If grit were private for example, the remote add would look like, “git@github.com:defunkt/grit.git”. To merge the changes done in the defunkt repository to a local branch, e.g., the master branch, you can run <pre class="console"> $ git checkout master $ git merge defunkt/master </pre> You can also use the git-pull helper to do the fetch+merge in one step. This comes in handy for one-shot pulls where you do not want to use the same repository again in the near future: <pre class="console"> $ git checkout master $ git pull git://github.com/defunkt/grit.git master </pre> Now that you have merged defunkt/grit’s master branch, you should probably push your branch to let others see the merge. 2008-02-23T01:31:04-08:00 16 pull-requests Pull Requests

2009-11-15T03:39:18-08:00

153510

<h2>First Heading should be H2</h2> Sometimes I wonder what people have against HTML. Oh that’s right. <h3>Next heading will obviously be H3</h3> Tables are cool when used for tabular data. <table> <tr> <th>Name</th> <th>Age</th> <th>Height</th> </tr> <tr> <td>Tom</td> <td>29</td> <td>5’9"</td> </tr> <tr> <td>Chris</td> <td>27</td> <td>6’0"</td> </tr> <tr> <td>Jimmy</td> <td>93</td> <td>3’6"</td> </tr> </table> <h4>Pay Attention to my H4</h4> You just don’t see enough ordered lists around these days. <ol> <li>alpha</li> <li>beta</li> <li>gamma</li> </ol> Unordered lists are nice for when you don’t want to prioritize things. <ul> <li>one</li> <li>two</li> <li>three</li> </ul> It’s always a good idea to quote someone famous so people think you know what you’re talking about. <blockquote> To be or not to be, that is the question </blockquote> If that doesn’t work, just fall back on math equations. That’s sure to work. a 2 + b 2 = c 2 Tables are a pain, huh? Just slap in some preformatted content using <pre> tags. <pre>size color L G M R S B</pre> This is a code repository so displaying <code>code</code> should be easy and look good too! <pre><code> def foo puts 'bar' end </code></pre> <pre> testing</pre> <h2>Sample Header</h2> <ul> <li>apples <ul> <li>Granny Smith</li> <li>Pink Lady</li> </ul></li> <li>bananas</li> <li>grapes</li> </ul> <del>-config</del>- <del>—config2</del>— italic <h3>To find out the version number when using RedCloth >= 4.0</h3> Use <code>RedCloth::VERSION</code> on a line all by itself: 4.2.2 Or surround it with square brackets in a sentence: Github is running 4.2.2. <h2>Need more Textile help?</h2> Read the <a href="http://redcloth.org/textile">reference manual</a> 2008-02-24T17:47:22-08:00 17 textile-formatting Textile Formatting

2009-11-18T02:01:34-08:00

10906

<h2>Overview</h2> Run this simple command in a local git repository and it will open your browser to the relative github project page (if the repository was cloned from github). Add it to your ~/.bash_profile file. <a href="http://pastie.caboo.se/158400">http://pastie.caboo.se/158400</a> <pre><code>alias github="open `git config -l | grep 'remote.origin.url' | sed -n 's/remote.origin.url=git@github.com:$.*$\/$.*$.git/https:\/\/github.com\/\1\/\2/p'`"</code></pre>If you’re interested in working on tasty command line nuggets like the one above, please check out the <a href="http://github.com/defunkt/github-gem">GitHub gem</a>. Edit by savetheclocktower: To get this to work, I had to escape the backticks so that the command within the backticks would not be evaluated until each time the alias is run. Without the backslashes, the command runs as soon as the alias is declared, at which time (at least in my case) it fails to find a URL. <pre><code>alias github="open \`git config -l | grep 'remote.origin.url' | sed -n 's/remote.origin.url=git@github.com:$.*$\/$.*$.git/https:\/\/github.com\/\1\/\2/p'\`"</code></pre>Edit by mkramlich: That didn’t fix it for me either, still broken, but got it closer. I also had to adjust the pattern to match the git URL syntax actually used in my remote.origin.url value. It now works perfectly for me as originally advertised, like this: <pre><code>alias github="open \`git config -l | grep 'remote.origin.url' | sed -n 's/remote.origin.url=git:\/\/github.com\/$.*$\/$.*$.git/https:\/\/github.com\/\1\/\2/p'\`"</code></pre> Edit by griff: Here is one that combines the two above versions and therefore supports both git@github.com and git://github.com urls. <a href="http://pastie.caboo.se/202275">http://pastie.caboo.se/202275</a> <pre><code>alias github="open \`git config -l | grep 'remote.origin.url' | sed -En \ 's/remote.origin.url=git(@|:\/\/)github.com(:|\/)(.+)\/(.+).git/https:\/\/github.com\/\3\/\4/p'\`"</code></pre>Edit by FiXato: Here is one that takes griff’s above version and makes it use ‘konqueror’ instead of open (as that command seems to be missing on my system), and runs it backgrounded, with all commandline output surpressed. It also uses sed -r instead of sed -E, as the -E argument was not supported by my version of sed (‘GNU sed version 4.1.5’). <pre><code>alias github="konqueror \`git config -l | grep 'remote.origin.url' | sed -rn \ 's/remote.origin.url=git(@|:\/\/)github.com(:|\/)(.+)\/(.+).git/https:\/\/github.com\/\3\/\4/p'\` > /dev/null 2>&1 &"</code></pre>Edit by Leonid Volnitsky: Yet another version(shorter and cleaner). And yes, open is non standard, as is -E (deprecated?): <pre><code>alias github='firefox `git config -l | sed -rn "s^remote.origin.url=git(@|://)(github.com)(:|/)(.+/.+).git^https://\2/\4^p"`'</code></pre>Clarification by jacaetevha: The open command and the sed -E argument are Mac (BSD) specific. So, if you want this to work on your Mac, keep them in there. open is a commandline program to use the default application for the argument passed to it (filename, URL, etc). Edit by jacaetevha: Here’s a version I use at work with a repository that started internally and then we push to Github. The difference here is that the origin is not Github, so the RegEx needs to account for that. It also works when Github is the origin. <pre><code>alias github='open `git config -l | grep github | grep url | \ sed -En "s^(remote.*.url)=git(@|://)(github.com)(:|/)(.+/.+).git^https://\3/\5^p"`' </code></pre>Edit by ches: After much fussing, here’s my version that will honor the currently active branch, or fall back to <code>master</code> if there is not a matching remote branch. You cannot actually break the line with backslashes as shown here simply for clarity (I’d suggest copying from the raw gist). As suggested by others, modify the OS X-specific <code>open</code> and <code>sed -E</code> with what is appropriate for you. If you see a simpler way to do this, do share. <a href="http://gist.github.com/90083">http://gist.github.com/90083</a> <pre><code>alias github='br=$(git branch --contains HEAD | sed -En "s/^\* //p"); \ if ! git ls-remote . | grep -q -e "refs/remotes/.*/${br}"; then br="master"; fi; \ echo $(git config -l | sed -En "s%remote.origin.url=git(@|://)(github.com)(:|/)(.+/.+).git%https://\2/\4/tree/${br}%p")' </code></pre>Edit by ssokolow: Thanks to the Portland project, modern Linux has an equivalent to the open command named xdg-open. I’ve forked ches’s version of the alias to replace “open” with “xdg-open” and “-En” with “-rn”. Due to the linebreaking issues, I’m just providing a gist link. <a href="http://gist.github.com/135000">http://gist.github.com/135000</a> 2008-02-26T20:48:14-08:00 18 jump-to-github-from-your-repository Jump to github from your repository

2009-06-23T21:26:18-07:00

46915

This guide has been moved to <a href="http://help.github.com/deleting-a-repo/">help.github.com</a>. You should be redirected momentarily. <script type="text/javascript"> window.location = 'http://help.github.com/deleting-a-repo/' </script> 2008-02-27T18:48:20-08:00 19 how-do-i-delete-a-repository How do I delete a repository?

2009-08-18T19:20:19-07:00

706

This guide has been moved to <a href="http://help.github.com/forking/">help.github.com</a>. You should be redirected momentarily. <script type="text/javascript"> window.location = 'http://help.github.com/forking/' </script> 2008-03-03T13:01:48-08:00 22 fork-a-project-and-submit-your-modifications Fork a project and submit your modifications

2009-08-18T19:22:11-07:00

706

<a href="http://develop.github.com/">Brand New API at develop.github.com</a> <hr /> We’re adding an API bit by bit. This page will serve as the documentation. The basic url template: <pre class="console"><code>http://github.com/api/version/format/username/repository/type/object </code></pre> <ul> <li>Current version: v1</li> <li>Acceptable formats: json, xml, yaml</li> <li>Acceptable types: commits, commit</li> </ul> Grabbing all recent commits: <pre class="console"> $ curl -i http://github.com/api/v1/xml/caged/gitnub/commits/master | less </pre> Grabbing a single commit: <pre class="console"> $ curl -i http://github.com/api/v1/json/defunkt/github-gem/commit/c26d4ce9807ecf57d3f9eefe19ae64e75bcaaa8b | less </pre> Repository search: <pre class="console"> $ curl -i http://github.com/api/v1/xml/search/merb | less </pre> You can also grab a user’s info, including a list of his repositories: <pre class="console"> $ curl -i http://github.com/api/v1/json/defunkt | less </pre> (Using token authentication, described below, will enable listing of private repositories.) With JSON requests, you can have the result passed to a callback method of your choice: <pre class="console"> $ curl -i http://github.com/api/v1/json/defunkt?callback=myCallbackMethod | less </pre> <h2>Projects using API</h2> <ul> <li><a href="http://drnicjavascript.rubyforge.org/github_badge/">GitHub Badge</a> (see also <a href="http://drnicwilliams.com/2008/05/03/github-badge-for-your-blog/">initial blog post</a>)</li> <li><a href="http://github.com/zmack/badjo/tree/master">Badjo</a></li> <li><a href="http://github.com/schleyfox/yaghb/tree/master">YAGHB</a> – Yet another github badge</li> <li><a href="http://github.com/wycats/textmate/">textmate gem</a> — Command-line package manager for textmate</li> <li><a href="https://github.com/heipei/github-commit-badge/tree">github commit badge</a> – GitHub commit badge, showing the most recent commits of chosen repos</li> <li><a href="http://github.com/andyatkinson/gadgets/tree/master">‘gadgets’ project and ‘demo generator’</a> (see also <a href="http://webandy.com/2008/11/15/gadgets-and-demo-generator">initial blog post</a>)</li> <li><a href="http://github.com/tristandunn/wp-github-projects/tree/master">GitHub Projects Wordpress Plug-in</a> – Also at the official Wordpress <a href="http://wordpress.org/extend/plugins/github-projects/">plug-in directory</a></li> <li><a href="http://github.com/johnbender/github-repos/tree/master">github-repos</a> – <a href="http://nickelcode.com/2008/11/27/github-repo-information-in-your-webpages/">Tutorial and Example</a></li> <li><a href="http://github.com/prtksxna/github-terminal/tree/master">github-terminal</a> , working example at <a href="http://prtksxna.github.com/github-terminal/">Github Terminal</a></li> <li><a href="http://github.com/Oshuma/git-trip/tree">git-trip</a> – Visualize git repositories.</li> <li><a href="http://github.com/kentbrew/github-social-badge">github-social-badge</a> – Social badge: visualize projects and followers. <a href="http://kentbrew.github.com">Working example</a></li> <li><a href="http://github.com/philsturgeon/codeigniter-github/tree/master">codeigniter-github</a> – CodeIgniter / PHP wrapper library.</li> <li><a href="http://tagaholic.me/2009/04/06/github-bookmarklet-for-user-pages.html">github user page bookmarklet</a> – adds additional repo stats to github user pages and provides repository sorting.</li> <li><a href="http://www.refactorme.com">RefactorMe</a> – Site posts daily code snippets from open source projects. All code is powered by Github Gists’ and the site will also create the gist for users if they do not want to create it themselves.</li> </ul> <h2>Additional resources</h2> <ul> <li><a href="http://github.com/blog/170-token-authentication">Token Authentication</a></li> <li><a href="http://github.com/guides/making-sense-of-the-participation-graph-data">Making sense of the participation graph data</a> ( explanation of the participation data )</li> </ul> 2008-03-11T18:02:54-07:00 23 the-github-api The GitHub API

2009-04-19T17:15:10-07:00

22282

Please, add your favorite cool and unusual Git techniques to this guide! <h2>git add --patch</h2> Lets you commit specific lines rather than whole files. <ul> <li><a href="http://tomayko.com/writings/the-thing-about-git">The Thing About Git</a></li> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html">git add manpage</a></li> </ul> <h2>git add --interactive</h2> <code>--interactive</code> works very similar to <code>--patch</code>, but gives you much more flexibility in choosing what (untracked) files and/or hunks you want to stage. <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html">git add manpage</a></li> </ul> <h2>git stash</h2> Stash away the uncommited changes in your working directory to get a clean HEAD. <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-stash.html">git stash manpage</a></li> </ul> <h2>Rebasing</h2> Rebasing is neat for cleaning up commits, but you will generally not want to rebase already pushed commits – it becomes messy for others who are working on forks of your repository. If for some reason you really do want to repush rebased commits, you will need to <code>git push -f</code>. <h3>git commit --amend</h3> Add your changes to the last commit instead of a new one. <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">git commit manpage</a></li> </ul> <h3>git rebase --interactive</h3> Rearrange, edit and squash commits. <ul> <li><a href="http://blog.madism.org/index.php/2007/09/09/138-git-awsome-ness-git-rebase-interactive">git awesome-ness</a></li> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html">git rebase manpage</a></li> </ul> <h2>git cherry-pick</h2> Want to grab only one commit from someone else’s repository? First fetch their changes and then apply the individual commit with <code>git cherry-pick 1111111</code> (where 1111111 is the beginning of the sha1 hash of the commit you want to apply). <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-cherry-pick.html">git cherry-pick manpage</a></li> </ul> 2008-04-09T00:32:50-07:00 26 cool-and-unusual-git-techniques Cool and unusual Git techniques

2009-03-08T07:32:59-07:00

14644

<h1>Direct SSH</h1> The first step to testing your connection is to run <code>ssh git@github.com</code>. If your key works, you should get a message like: <pre class="console">Hi username! You’ve successfully authenticated, but GitHub does not provide shell access.</pre> If this step fails, try running <code>ssh -v git@github.com</code>. This will print out a bunch of info on what ssh is trying to do. In this output you should check that ssh is connecting to the correct server, on the correct port (22). Many firewalls and proxies will block this connection. Also ensure that ssh is reading the correct key files, these are at ~/.ssh/id_rsa, id_dsa and identity by default. If your key is not at this location, you should move it or create an override (see the “SSH config” section below). <h1>Permission to user/repo2 denied to user/repo1</h1> This error occurs when you attach your key as a deploy key on repo1. You can push and pull from that repo without issue, but you won’t have access to any other repo with your key. To solve this, remove the key from repo1’s deploy keys and attach it on your <a href="https://github.com/account">account page</a> instead. This key will now have access to all repos your account has access to. <h1>Permission denied (publickey)</h1> This is usually caused when ssh cannot find your keys. Make sure your key is in the default location, <code>~/.ssh</code>. If you run <code>ssh-keygen</code> again and just press enter at all 3 prompts it will be placed here automatically. Then you can add the contents of id_rsa.pub to <a href="https://github.com/account">my github keys</a>. If id_rsa.pub doesn’t work try id_dsa.pub. You might need to generate a new dsa key with <code>ssh-keygen -t dsa</code> if you just have an rsa key. <h2>If Using sudo With Git Commands, Ensure Key Was Generated With sudo</h2> If you are using sudo with git commands (e.g. using <code>sudo git clone</code> because you are deploying to a root-owned folder), ensure that you also generated the key using sudo. Otherwise, you will have generated a key for your current user, but when you are doing sudo git, you are actually the root user – thus, the keys will not match. In summary, if you are using <code>sudo git</code>, then also use <code>sudo ssh-keygen</code>. <h1>SSH config</h1> If your github authentication information is different from your machine account information, you’ll need to modify your ssh configuration file. Create or open the file at <code>~/.ssh/config</code> Add the following lines: <pre>Host github.com User git Hostname github.com PreferredAuthentications publickey IdentityFile [local path to private key half of github public key you provided] </pre> You may also need to update the permissions on your .ssh folder and its contents. The SSH application will ignore secret files that are too permissive. <pre class="console">chmod 700 ~/.ssh chmod 600 ~/.ssh/* </pre> <h1>FATAL ERROR: Disconnected: No supported authentication methods available</h1> You should be aware of the environment variable GIT_SSH, which is used by git to find your ssh-speaking client, if ssh doesn’t work for you. The git install may be using plink.exe (via GIT_SSH) to perform the authentication. If so, make sure you have pageant.exe running, and the key you created for github loaded into it. This provides the key to plink.exe; without it, the above error will occur. See “this post”: http://groups.google.com/group/github/browse_thread/thread/21fd06fb8c3f43bd/f5c44b2197d1be15 for a longer discussion. Especially with cygwin-git+pageant+putty/plink, you might want to set GIT_SSH to your plink.exe location — unless that doesn’t work for you. In certain circumstances (perhaps after a service pack installation), you will find git network operations failing with this is because plink.exe running from your (cygwin-provided) git command <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/cygwin-clobbers-pageant.html">can’t talk with pageant to get its keys</a> . A solution is to set up a script that has: <pre class="console">/cygdrive/c/ntnot/plink.exe -i “c:\users\you\.ssh\key-file-for-github.ppk” $1 $2</pre> and set GIT_SSH to point to this: <pre class="console">declare -x GIT_SSH=“c:\path\to\script”</pre> This explicitly provides the key for plink to use, rather than have it talk with pageant. This problem occured for me when I used the executable with pageant that came with WinSCP, but a version of plink in a different directory. I have not found the exact cause yet. All versions were plink/pageant 0.60. (Not running under Cygwin) I did not have luck with this approach; GIT_SSH was set to plink.exe already; when I tried to create this script and reset the GIT_SSH I got a “could not fork” error back from git even though the script would run happily on it’s own – elijahsmith 9/11/08 I couldn’t get the latest versions of plink and pageant (as of 2008-Nov-15) to talk, and I’m not running Cygwin. The only solution was to revert to using open-ssh by setting <code>GIT_SSH</code> to <code>C:\Program Files\prg\Git\bin\ssh.exe</code>. — <a href="http://github.com/dandv">dandv</a> <h1>On Windows, you can’t type “y” to confirm the “Store [server’s host] key in cache?” prompt</h1> This happens because git eats up the ssh client’s STDIN output. To work around that, launch <code>ssh github.com</code> or <code>plink.exe -agent github.com</code> standalone and press “y” at the prompt. 2008-04-09T11:22:35-07:00 27 addressing-authentication-problems-with-ssh Addressing authentication problems with SSH

2009-10-23T16:47:30-07:00

143421

<h2>No passphrase</h2> The simplest solution, of course, is to not put a passphrase on your ssh key. To do this, follow the steps outlined in [[Providing your SSH Key]]. When prompted for a passphrase, simply hit enter. <h2>ssh-agent</h2> Use <code>ssh-agent</code>. Since you should already have a keypair, already known to GitHub, this is easy. <pre class="console">$ eval `ssh-agent` $ ssh-add [key name such as id_rsa or it will add all]</pre> That’s it. <h3>ssh-agent on OSX Tiger</h3> If you want to use a GUI tool such as <a href="http://macromates.com/">TextMate</a> with GitHub you can install <a href="http://www.macupdate.com/info.php/id/9773">sshLogin</a>. It will manage your keys for both GUI apps and Terminal sessions. <h3>ssh-agent on OSX Leopard</h3> On OSX Leopard <code>ssh-agent</code> is started automatically when needed. You just need to run ssh-add. If you don’t want to run ssh-add every time you login, you can add your default key to your default OS X account keychain with: <pre class="console">$ /usr/bin/ssh-add -K</pre> Extract from <code>man ssh-add</code> (On both Tiger and Leopard): <blockquote> -K* When adding identities, each passphrase will also be stored in your keychain. When removing identities with -d, each passphrase will be removed from your keychain. </blockquote> <blockquote> -k* Add identities to the agent using any passphrases stored in your keychain. </blockquote> 2008-04-09T15:33:33-07:00 28 how-to-not-have-to-type-your-password-for-every-push How to not have to type your password for every push

2009-01-01T13:14:24-08:00

706

The formatting of the commands on this page is slightly messed up due to Textile – use the original blog link: <a href="http://www.jaisenmathai.com/blog/2008/04/10/how-to-get-started-hosting-your-git-repository-using-github-and-osx/" target="_blank">Originally posted on jaisenmathai.com</a>. Hosting remote git repositories using <a href="http://github.com" target="_blank">GitHub</a> is completely painless, assuming that you’ve already signed up for an account at GitHub and that you have Git installed on your computer. For OSX, you can use macports to easily get Git’s command line tools installed. <ul> <li><a href="#publickeys">Create your public keys</a></li> <li><a href="#makerepo">Make a repository on GitHub</a></li> <li><a href="#remoterepo">Specify GitHub as a remote repository</a></li> <li><a href="#pushcode">Push your code to GitHub</a></li> </ul> <a name="publickeys"></a><h2>Create your public keys</h2> If you haven’t already given GitHub your public key, you’ll want to do that now. If you don’t already have a public key, let’s do that first. Fire up a terminal and do the following: <pre class="console">user# cd ~/.ssh user# ssh-keygen Generating public/private rsa key pair. Enter file in which to save the key (/Users/username/.ssh/id_rsa): # press enter here Enter passphrase (empty for no passphrase): # type in your passphrase here Enter same passphrase again: # type your passphrase again Your identification has been saved in /Users/username/.ssh/id_rsa. Your public key has been saved in /Users/username/.ssh/id_rsa.pub. The key fingerprint is: 50:43:77:c6:97:af:61:82:dc:ea:9b:6b:67:d4:1b:61 user@host</pre> Now that you’ve generated your public key, you should see it when you do an <tt>ls</tt>. Once this is verified, you can copy the contents to your clipboard: <pre class="console">user# ls known_hosts id_rsa id_rsa.pub user# cat id_rsa.pub | pbcopy</pre> Now that your public key is on your OSX clipboard head on over to <a href="http://github.com/account" target="_blank">http://github.com/account</a>, paste it in, and save it. Note that git expects to use the key named ‘id_rsa’ – if you generate a key with a different name, you’re likely to get ssh errors. <a name="makerepo"></a><h2>Make a repository on GitHub</h2> Next, you’ll want to create a repository on GitHub. Go to <a href="http://github.com/repositories/new" target="_blank">http://github.com/repositories/new</a> and fill out the form and make note of the project name as we’ll be using that as the name of your git repository. Feel free to select either public or private. <a name="remoterepo"></a><h2>Specify GitHub as a remote repository</h2> Let’s move on to specifying GitHub as a remote repository on your local workstation/laptop. Head back to your terminal and do the following. <pre class="console">user# cd ~/repos/my_repo user# vi .git/config</pre> You should see a core section and will want to add a remote section. The name can be anything, but I recommend using something like “github” to make it easier to remember what you’re doing down the road. Let’s add the following to the bottom of the config file. <pre class="console">[remote “github”] url = git@github.com:git_username/projectname.git fetch = +refs/heads/:refs/remotes/origin/ push = refs/heads/master:refs/heads/master</pre> Your config file should now look something like this. <pre class="console">[core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote “github”] url = git@github.com:git_username/projectname.git fetch = +refs/heads/:refs/remotes/origin/ push = refs/heads/master:refs/heads/master</pre> You can also do this by typing this into your terminal. <pre class="console">user# git remote add github git@github.com:git_username/projectname.git</pre> <a name="pushcode"></a><h2>Push your code to GitHub</h2> Both essentially do the same thing, but once you’ve defined a remote git repository, you can begin pushing your code to it. Let’s test it out and see if we can push our git repository to GitHub. <pre class="console">user# git push github master Enter passphrase for key ‘/Users/username/.ssh/id_rsa’: # enter your passphrase here updating ‘refs/heads/master’ from 000000000000000000000000000000 to 871b8e6c61bc6fca6ee974bc836d70 Also local refs/remotes/origin/master Generating pack… Counting objects: 18 Done counting 1019 objects. Deltifying 1019 objects… 100% (1019/1019) done Writing 1019 objects… 100% (1019/1019) done Total 1019 (delta 236), reused 0 (delta 0) refs/heads/master: 000000000000000000000000000000 > 871b8e6c61bc6fca6ee974bc836d70</pre> That’s it! Now go back to your browser and verify that all your files are showing up. Go back to <a href="http://github.com" target="_blank">http://github.com</a> and you should see “Your Repositories” to the right-hand side with your project directly underneath it. Click on your project and you should see your files. <a href="http://www.jaisenmathai.com/blog/2008/04/10/how-to-get-started-hosting-your-git-repository-using-github-and-osx/" target="_blank">Comment on the original blog post</a>. 2008-04-11T00:19:23-07:00 30 setting-up-a-remote-repository-using-github-and-osx Setting up a remote repository using GitHub and OSX

2009-09-28T14:48:49-07:00

13400

Create a tunnel to github with the git default daemon port like this: <pre class="console"><code>$ ssh -L9418:github.com:9418 myuser@myhomessh.com</code></pre> And clone repositories replacing <code>github.com</code> with <code>localhost</code>, like so: <pre class="console"><code>$ git clone git://localhost/someuser/someproject.git</code></pre> If you want to preserve the “correct” metadata, there are several options <ol> <li>replace localhost origin with github.com after cloning <pre class="console"><code>git remote rm origin git remote add origin git://github.com/someuser/someproject.git</code></pre></li> <li>add github.com to your hosts file and point it to 127.0.0.1</li> <li>add github.com to your ~/.ssh/config: <pre><code>Host github.com HostName localhost </code></pre> </li> <li>use your favourite packet forwarder, example for Mac OS X: <pre class="console"><code>sudo ipfw add 00100 fwd 127.0.0.1,9418 tcp from me to github.com dst-port 9418</code></pre> and when you are done, don’t forget to remove it: <pre class="console"><code>sudo ipfw delete 00100</code></pre> (use caution, especially if you are using ipfw already and have rule 00100 in place)</li> </ol> Stuck behind a corporate firewall? <a href="http://blog.codeslower.com/2008/8/Using-PuTTY-and-SSL-to-securely-access-GitHub-repositories-via-SSH">Justin Bailey</a> has a good guide. Scroll down for a *nix solution as well. 2008-04-15T08:46:54-07:00 32 how-to-clone-from-github-with-ssh-tunnels How to clone from github with ssh tunnels

2009-02-03T09:15:25-08:00

49715

Importing an existing local git repository is dead easy. <ol> <li><a href="https://github.com/repositories/new">Create a new github project</a> (the link is close to the top right of <a href="https://github.com/">your dashboard</a>)</li> <li><pre class="console"> cd /existing/local/git/repo git remote add origin git@github.com:YourGitHubUsername/your-github-projectname.git git push origin master </pre></li> </ol> 2008-04-15T11:41:30-07:00 34 import-an-existing-git-repo Import an existing git repo

2008-10-27T18:49:26-07:00

1683

This is pretty much the shorthand version of this blogpost: <a href="http://kylecordes.com/2008/04/30/git-windows-go">http://kylecordes.com/2008/04/30/git-windows-go</a> Portuguese version available at: <a href="http://blog.tinogomes.com/2008/05/11/instalando-e-usando-git-no-windows-xp/">http://blog.tinogomes.com/2008/05/11/instalando-e-usando-git-no-windows-xp/</a> Another excellent and thorough resource is <a href="http://nathanj.github.com/gitguide/">An Illustrated Guide to Git on Windows</a>. Git for Windows Developers: <a href="http://www.lostechies.com/blogs/jason_meridth/archive/2009/06/01/git-for-windows-developers-git-series-part-1.aspx">http://www.lostechies.com/blogs/jason_meridth/archive/2009/06/01/git-for-windows-developers-git-series-part-1.aspx</a> <h2>Git Installation</h2> There are currently two ways to install Git in Windows. One way is to install it together with <a href="http://www.cygwin.com/">cygwin</a> . But the easiest way is to install git with <a href="http://code.google.com/p/msysgit/">msysGit</a>. <h3>Installing git with msysGit</h3> Download the latest installer from <a href="http://code.google.com/p/msysgit/downloads/list">Google code</a> and run it. To avoid path conflicts, pick the “Use Git Bash only” setting during the installation. <h4>using git from the cmd.exe prompt</h4> I’m not sure if this is a universal thing or not, but I will post my problems, and hopefully, they will help somebody. With msysgit, if you want to be able to run git from the command prompt, and thus use any git related software (EGit plugin for Eclipse, as an example), then you must do two things. First, you must select the “Run Git from the Windows Command Prompt” option, and second, you must use putty/plink/pageant for SSH. then you should be able to connect to GitHub without problem <h3>Creating your very own SSH-key</h3> In order to use git, you will need to generate a key. To do this open Git Bash (from the start menu, quicklauncher or right click a directory and choose “Git Bash Here”.) Type in the following: <pre class="console"> <code> $ ssh-keygen -C "your@email.com" -t rsa </code> </pre> Use your own email address of course. Use the default file name (id_rsa) and provide a password. The generated key will be stored in your profile, e.g.: <code>C:\Documents and Settings\YourNameHere\.ssh\</code> on XP or <code>C:\Users\YourNameHere\.ssh\</code> on Vista. <h3>Identify yourself to git</h3> With the bash shell still opened type in the following: <pre class="console"> <code> $ git config --global user.name "Your Name Here" $ git config --global user.email your@email.com </code> </pre> This will set the info stored when you commit to a git repository. Now that you’ve set up git, you can find many more guides on how to use it in the <a href="http://github.com/guides">guide list</a> 2008-04-15T21:03:09-07:00 35 using-git-and-github-for-the-windows-for-newbies Using Git and Github for the Windows for newbies

2009-09-06T22:28:13-07:00

67798

We generate your Gravatar from the email address that is part of the commit. Try running <code>git log</code> in your repo to see the email address that specified for each commit. Make sure you have a Gravatar for each email address that you use to commit with. To fix your email when committing in git: <pre class="console"> [~]$ git config --global user.email me@example.com </pre> You may also need to check your Gravatar account to make sure your Gravatar has a G rating. If you wish to set this on a repo-level instead of a global one: <pre class="console"> [~/path/to/repo]$ git config user.email me@example.com </pre> This change will only affect future commits. Your past commits will retain the old, incorrect address. If you add an email address to your account that matches existing commits, it may take some time for caches to clear before the commit will link to your account and show your gravatar. 2008-04-17T01:14:38-07:00 37 i-m-missing-my-gravatar-icon-on-my-commits I'm missing my Gravatar icon on my commits

2009-07-04T10:15:33-07:00

101480

Submodules allows you to manage subparts of a project in different git repositories and reference them in a “superproject” repository. Here is a link with a great example of submodule usage to track your plugins: <a href="http://woss.name/2008/04/09/using-git-submodules-to-track-vendorrails/">http://woss.name/2008/04/09/using-git-submodules-to-track-vendorrails/</a> <h3>Adding Rails as a submodule</h3> <code>git submodule add git://github.com/rails/rails.git vendor/rails</code> Once the submodule is added we need to register this submodule using `init`. <code>git submodule init</code> From now we can update all the submodules using the following command: <code>git submodule update</code> Tell Capistrano to update submodules with the following line in <code>config/deploy.rb</code> <code>set :git_enable_submodules, true</code> If you have used your private clone URL, you have to use SSH agent and forward it: <code>ssh_options[:forward_agent] = true</code> <h3>Removing Rails as a submodule</h3> <ol> <li>Remove references to the submodule in <code>.gitmodules</code> and <code>.git/config</code>.</li> <li>Run the following command:</li> </ol> <code>git rm --cached vendor/rails</code> Note: do not use a trailing slash on the submodule directory From <a href="http://pitupepito.homelinux.org/?p=24">http://pitupepito.homelinux.org/?p=24</a> 2008-04-17T14:46:35-07:00 39 using-git-submodules-to-track-plugins Using git submodules to track plugins

2009-05-04T18:09:39-07:00

25343

Github is all about sharing content, so at some point you’ll be willing to push from your local git repository to github’s. To push a local branch to your remote repository, do: <code>git push <remote_repository_name> <branch_name></code> Examples: Assuming you did <code>git clone git://github.com/you/your-project.git</code>, hence <code>origin</code> is the remote. - pushing the branch <code>my_new_branch</code> to your Github repos: <code>git push origin my_new_branch</code> - merging the branch <code>experiment</code> into <code>master</code> and push it: <code>git checkout master</code> <code>git merge experiment</code> <code>git push origin master</code> To remove a useless branch after merging and/or pushing, see <a href="http://github.com/guides/remove-a-remote-branch">Guide: Remove a remote branch</a>. 2008-04-17T19:26:21-07:00 40 push-a-branch-to-github Push a Branch to GitHub

2009-08-30T21:16:25-07:00

3300

<h3>Git principles</h3> <a href="http://eagain.net/articles/git-for-computer-scientists/" title="lots of pictures">Git for computer scientists.</a> <a href="http://www.kernel.org/pub/software/scm/git/docs/user-manual.html">Git user’s manual</a> <a href="http://www-cs-students.stanford.edu/~blynn/gitmagic/">Git Magic</a> <h3>Zach Rusin’s <a href="http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html">Git Cheat Sheet</a></h3> The SVG is at: <ul> <li><a href="http://ktown.kde.org/~zrusin/git/git-cheat-sheet.svg">http://ktown.kde.org/~zrusin/git/git-cheat-sheet.svg</a></li> </ul> Sample png’s are here: <ul> <li><a href="http://ktown.kde.org/~zrusin/git/git-cheat-sheet-medium.png">http://ktown.kde.org/~zrusin/git/git-cheat-sheet-medium.png</a></li> <li><a href="http://ktown.kde.org/~zrusin/git/git-cheat-sheet-large.png">http://ktown.kde.org/~zrusin/git/git-cheat-sheet-large.png</a></li> </ul> <h3>cheat.errtheblog.com</h3> <ul> <li><a href="http://cheat.errtheblog.com/s/git/">http://cheat.errtheblog.com/s/git/</a></li> <li><a href="http://cheat.errtheblog.com/s/git_usage/">http://cheat.errtheblog.com/s/git_usage/</a></li> <li><a href="http://cheat.errtheblog.com/s/gitsvn/">http://cheat.errtheblog.com/s/gitsvn/</a></li> </ul> <h2>A Practical Git GUIDE</h2> (credit: notes extracted from GIT screencast at http://www.peepcode.com.) <h3>CONFIGURE</h3> identify yourself to git: email and your name git config —global user.name “David Beckwith” git config —global user.email “dbitsolutions@gmail.com” To view all options: git config —list OR cat .gitconfig <h4>SET UP ALIASES</h4> git config —global alias.co checkout <h4>VIEW YOUR CONFIGURATION</h4> cat .gitconfig <h4>TO IGNORE WHITESPACE (Ruby is whitespace insensitive)</h4> git config —global apply.whitespace nowarn Some nice aliases: gb = git branch gba = git branch -a gc = git commit -v gd = git diff | mate gl = git pull gp = git push gst = git status <h3>START USING GIT</h3> git init <h4>TO IGNORE SOME FILES</h4> Add a file in the root directory called .gitignore and add some files to it: (comments begin with hash) *.log db/schema.rb db/schema.sql Git automatically ignores empty directories. If you want to have a <code>log/</code> directory, but want to ignore all the files in it, add the following lines to the root <code>.gitignore</code>: (lines beginning with ‘!’ are exceptions) log/* !.gitignore Then add an empty <code>.gitignore</code> in the empty directory: touch log/.gitignore <h4>TO SCHEDULE THE ADDITION OF ALL FILES TO THE NEXT COMMIT</h4> git add . <h4>TO SEE THE STATUS</h4> git status <h4>TO COMMIT</h4> git commit -m “First import” <h4>TO SEE WHAT HAS BEEN COMMITTED</h4> git ls-files <h4>TO SCHEDULE DELETION OF A FILE</h4> git rm [file name] <h4>TO COMMIT ALL CHANGES IN FILES IN THE CURRENT REPOSITORY</h4> git commit -a <h4>TO SCHEDULE THE ADDITION OF AN INDIVIDUAL FILE TO THE NEXT COMMIT</h4> git add [file name] <h4>TO VIEW THE DIFFERENCE AS YOU COMMIT USE THE -v OPTION</h4> git commit -v <h4>TO COMMIT AND TYPE THE MESSAGE ON THE COMMAND LINE USE THE -m OPTION</h4> git commit -m “This is the message describing the commit” <h4>TO COMMIT AND GET AUTOMATICALLY ANY CHANGES FROM OTHER PEOPLE USE THE -a OPTION</h4> git commit -a <h4>THE NORMAL COMMIT COMMAND:</h4> git commit -a -v <h4>TO VIEW A LOG OF YOUR COMMITS</h4> git log <h4>TO VIEW A LOG OF YOUR COMMITS WITH A GRAPH TO SHOW THE EXTENT OF THE CHANGES</h4> git log —stat <h4>TO HAVE PAGINATION WHEN VIEWING THE LOG FILE USE THE -v OPTION</h4> git log -v <h4>TO VISUALIZE YOUR CHANGES</h4> gitk —all <h4>TO CREATE A NEW TAG AND PUSH IT ON THE REMOTE BRANCH</h4> git tag “v1.3” git push —tags <h4>TO CREATE A NEW BRANCH</h4> git branch [name of your new branch] <h4>TO PUSH THE NEW BRANCH TO A REMOTE REPOSITORY</h4> git push origin [new-remote] <h4>TO PULL A NEW BRANCH FROM A REMOTE REPOSITORY</h4> git fetch origin [remote-branch]:[new-local-branch] <h4>TO VIEW ALL OF THE EXISTING BRANCHES</h4> git branch <h4>TO VIEW A LIST OF ALL BRANCHES</h4> git branch -a <h4>TO SWITCH TO ANOTHER BRANCH</h4> The state of your file system will change after executing this command. git checkout [name of the branch you want to switch to] OR git co [name of the branch you want to switch to] <h4>TO MAKE SURE THAT YOUR NEW BRANCH GETS CHANGES FROM THE MASTER BRANCH (WHERE EVERYBODY ELSE IS WORKING) USE THE REBASE COMMAND</h4> git rebase master <h4>TO MERGE YOUR NEW BRANCH INTO THE MASTER BRANCH</h4> First, switch back to the master branch: git co master Check to see what changes you’re about to merge together, compare the two branches: git diff master xyz If you’re in a branch that’s not the <code>xyz</code> branch and want to merge the <code>xyz</code> branch into it: git merge xyz <h4>TO REVERT YOUR CHANGES to before the merge.</h4> git reset —hard ORIG_HEAD <h4>TO RESOLVE CONFLICTS just edit your file.</h4> Remove the markings, add the file, then commit. <h4>TO CREATE A BRANCH AND SWITCH TO THE BRANCH IN ONE MOVE:</h4> git checkout -b [name of new branch] <h4>TO CREATE A “CLIPBOARD” or “STASH” OF CHANGES THAT ARE NOT YET COMMITED (SO THAT YOU CAN SWITCH TO ANOTHER BRANCH IN THE MIDDLE OF YOUR CHANGES.), CREATE A STASH.</h4> git stash “Put a message here to remind you of what you’re saving to the clipboard” <h4>TO SWITCH AWAY FROM THE CURRENT BRANCH</h4> git co [branch you want to switch to] Do whatever Then switch back to the stashed branch git co [the stashed branch] <h4>TO VIEW THE LIST OF STASHES</h4> git stash list <h4>TO LOAD BACK THE “CLIPBOARD” OR “STASH”</h4> git stash apply Now you can continue to work where you were previously. <h4>TO DELETE A BRANCH THAT IS NOT USED ANYMORE, but already merged into the current branch. (TO CLEAN UP)</h4> git branch -d [name of branch you want to delete] <h4>TO DELETE AN UNMERGED BRANCH</h4> git branch -D [name of branch you want to delete] <h4>TO DELETE THE STASH. (ERASE THE “CLIPBOARD” FROM MEMORY)</h4> git stash clear <h4>TO SET UP YOUR REPOSITORY FOR SHARING ON A CENTRAL SERVER</h4> Copy up your repository. e.g.: scp -r my_project deploy@yourbox.com:my_project Move your files on the remote server to <code>/var/git/my_project</code> For security make the owner of this project git On the repository server: sudo chown -R git:git my_project Then (for security) restrict the “deploy” user to doing git-related things in <code>/etc/passwd</code> with a <code>git-shell</code>. <h4>TO CHECK OUT THE GIT REPOSITORY TO YOUR LOCALHOST. ON YOUR LOCAL HOST DO THIS:</h4> git clone git@yourbox.com:/var/git/my_project <h4>TO SEE SOME INFO ABOUT THE REPOSITORY THAT WILL TELL YOU WHICH REPOSITORY IS THE MASTER AND WHICH IS THE SLAVE:</h4> cat .git/config By virtue of having cloned the remote repository, your local repository becomes the slave and will track and synchronize with the remote master branch. <h4>TO UPDATE YOUR LOCAL BRANCH FROM THE REMOTE SERVER:</h4> git pull <h4>TO GET A COPY OF THE ENTIRE REMOTE REPOSITORY (e.g. a repository named “laptop”) WITHOUT MERGING THEM INTO YOUR LOCAL BRANCHES USE FETCH</h4> git fetch laptop <h4>TO MERGE TWO LOCAL BRANCHES (ie. your local xyz branch with your local master branch) USE MERGE</h4> git merge laptop/xyz This merged the (already copied laptop repository’s xyz branch) with the current branch you’re sitting in. <h4>TO MERGE THE REMOTE BRANCH WITH YOUR LOCAL BRANCH THAT YOU ARE SITTING IN USE PULL</h4> <h4>TO ADD LOCAL KNOWLEDGE (TO YOUR LOCAL REPOSITORY) OF A 2ND REMOTE REPOSITORY, LIKE YOUR LAPTOP</h4> git remote add laptop duo2book.local:repos/m_project where ’’’laptop’’" is the name of the remote repository and “‘’duo2book.local’’” is the name of the remote machine. <h4>TO VIEW META INFORMATION ABOUT THAT REMOTE REPOSITORY</h4> git remote show laptop <h4>TO PUSH A COMMITTED LOCAL CHANGE OF THE xyz BRANCH TO THE REMOTE laptop BRANCH</h4> git push laptop xyz <h4>TO CREATE A TRACKING BRANCH (A SLAVE BRANCH). Ie. to link a local branch to a remote branch:</h4> git branch —track local_branch remote_branch <h4>NOW IF YOU’RE SITTING IN THE LOCAL TRACKING BRANCH, TO PULL YOU DON’T NEED TO SPECIFY THE REMOTE TRACKING BRANCH:</h4> git pull Note: You can track(link) different local branches to different remote machines. For example, you can track your friend’s “upgrade” branch with your “bobs_upgrade” branch, and simultaneously you can track the origin’s “master” branch (of your main webserver) with your local “master” branch. By convention, ‘origin’ is the local name given to the remote centralized server which is the way SVN is usually set up on a remote server. <h4>TO SEE WHICH LOCAL BRANCHES ARE TRACKING A REMOTE BRANCH:</h4> git remote show origin <h4>TO WORK WITH AN SVN REPOSITORY BUT WORK WITH GIT LOCALLY:</h4> git-svn clone [http location of an svn repository] Now you can work with the checked out directory as though it was a git repository. (cuz it is) <h4>TO PUSH (COMMIT) CHANGES TO THE REMOTE SERVER</h4> git-svn dcommit <h4>TO UPDATE YOUR LOCAL REPOSITORY FROM THE SVN REPOSITORY</h4> git-svn rebase NOTE: make sure you have your perl bindings to your local svn installation. <h4>I screwed up, how do I reset my checkout?</h4> git checkout -f 2008-04-18T09:17:49-07:00 41 git-cheat-sheet Git Cheat Sheet

2009-10-19T16:59:09-07:00

141533

The solution detailed in this guide is fairly complex and may not be ideal for most users. We recommend you check out the solutions detailed in [[Managing multiple clients and their repositories]] first. <h2>The Problem</h2> One might encounter a situation where two GitHub accounts might be necessary. Naturally, I mean two pay accounts in order to remain in good standing according to the TOS (or one free and one pay account). And we all want to stay in good standing with GitHub since they were awesome enough to make this great web application, right? Nevertheless, with that said, one might find one’s self in this situation. A problem that one is likely to encounter in this situation is attempting to maintain two or more repositories that use more than one GitHub account. Using the default public/private key setup that GitHub suggests works great when only one account is involved, but when one attempts to clone a repository using a second account, by default, git attempts to use the first account, which is likely declined resulting in failure. This article is assuming that you already have two git accounts created and that you already have the first <a href="http://github.com/guides/providing-your-ssh-key">key pair</a> in place on both your local system and on GitHub. <h2>Generating a Second Key Pair</h2> Read this section COMPLETELY before actually doing anything. You could easily get yourself into a lot of trouble if you do not. GitHub identifies which account you are attempting to access by the SSH key that you give it. To this end, you cannot use the same key pair for more than one GitHub account. You will need to follow the instructions given in the guide entitled <a href="http://github.com/guides/providing-your-ssh-key">Providing your SSH Key</a>. I think it would be unwise to reproduce part of that guide here. Upon executing the ssh-keygen command, you will be presented with a prompt similar to the following: <pre class="console">Enter file in which to save the key (/Users/tom/.ssh/id_rsa):</pre> WARNING: If you already had a key pair and are using it for anything at all, do NOT leave this blank nor should you use the default file suggested. It will overwrite your primary key pair, and that would be very bad. Instead of using “id_rsa”, you should use something like “id_rsa_github_useraccount” to denote the purpose of the key. So ultimately, you would enter: <pre class="console">/Users/tom/.ssh/id_rsa_github_useraccount</pre> <h2>Placing the Public and Private Keys</h2> <h3>Private Key</h3> You will not actually be putting the private key anywhere, but instead only referencing it. For this, you will need to open the SSH config (~/.ssh/config) file in your favorite editor. Once in this file, you should add the following: <pre><code># GitHub for cylence Host github-tom HostName github.com User git IdentityFile /Users/tom/.ssh/id_rsa_git_tom</code></pre> The top line is a simple comment, you can leave this out of you choose. Next is the name of the Host, this is what you will use when referencing this connection and after the word “Host” followed by a space is completely arbitrary. The HostName must be “github.com” as is the same with the User.Notice that it is still “git” and not an account name. Lastly, the IdentityFile line must contain a non-reative path to your newly created private key (NOT ending with .pub). <h3>Public Key</h3> Once the private key is properly being referenced, you must tell GitHub what the public key is. You do this by accessing your <a href="http://github.com/account">account page</a> on GitHub. Place your public key (including the carriage return at the end) into the “SSH Public Keys” textarea field. <h2>Using the Newly Created Keys</h2> From here on, everything is the same except for one component. To present an example, we will look at a standard clone command. <pre class="console">git clone git@github.com:account/repository.git</pre> Traditionally, this command consists of “git clone”, the command to be performed, followed by a mostly ordinary ssh connection. <pre>user@domain:path/somewhere/file.extension</pre> What we will be changing is the domain portion of this line. Instead of using the domain “github.com”, we will be specifying the pre-configured SSH connection we built earlier. It is referenced using the Host line. Using our previous example, the end result would look like this: <pre class="console">git clone git@github-tom:account/repository.git</pre> <h2>Notes</h2> If you are running keychain to manage your SSH keys you may need to stop ssh-agent and add the new key to your keyring for it to work properly. If you are seeing failed access to your repositories as your other user, even though you’re configured to use the new key with your correct user you may wish to give this a try. On OSX Leopard is built in keychain integration, so either don’t store your passphrase in keychain or don’t use passphrase for your private key at all. Regarding multiple local keys and ssh-agent, be sure to add each key with ssh-add, you can also try prefixing your git commands (when interacting with the remote repo) with SSH_AUTH_SOCK="", which will make ssh not use the ssh-agent. 2008-04-24T16:24:28-07:00 42 multiple-github-accounts Multiple GitHub Accounts

2009-10-19T05:13:40-07:00

140313

Don’t you hate when you can’t remove that file full of cleartext passwords from your github account? Even if you <code>git rm</code> it, it still is accessible in previous versions of the tree. So, you need to rewrite the entire tree. Fortunately, this is really easy with git. <h2>How?</h2> <pre class="console"> git filter-branch -f --index-filter 'git update-index --remove filename' HEAD git push --force --verbose --dry-run git push --force </pre> <code>filename</code> is what you want to remove. Now, when you browse past revisions, the file will be gone! You will need to do <code>git push --force</code> to push your changes, as this is no longer a fast forward push (the history and parents have been rewritten) To retain tags you must specify <code>--tag-name-filter "cat"</code> but note that this will overwrite your existing tags. When doing this I usually create a backup like this: <pre class="console"> cd .git mkdir backup cp -r refs backup/refs cp packed-refs backup </pre> since often I run filter-branch several times and you must delete <code>refs/original</code> between runs. <h2>An Improved Method</h2> The method given above actually rewrites the whole repository history. Usually, you’ll only want to rewrite it from the revision the sensitive data was introduced: <pre class="console"> git filter-branch -f --index-filter 'git update-index --remove filename' <introduction-revision-sha1>..HEAD git push --force --verbose --dry-run git push --force </pre> Where introduction-revision-sha1 is the SHA1 that the file was first committed to the repository. <h2>References</h2> <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-filter-branch.html">git-filter-branch documentation</a></li> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#cleaning-up-history">Git user manual – Cleaning up history</a></li> </ul> 2008-04-27T08:39:04-07:00 43 completely-remove-a-file-from-all-revisions Completely remove a file from all revisions

2009-10-22T09:17:13-07:00

62842

<h2>What it is</h2> The participation graph displays a user’s participation to a given project aggregated by week. Basically, it shows how many commits a project had in a week, and how many of those were made by the given user. <h2>The data</h2> The url to grab participation data for a given project is in the form of <pre><code>http://github.com/cache/participation_graph/user/repo_name</code></pre>Let’s take, for example, the following url: <a href="http://github.com/cache/participation_graph/rails/rails">http://github.com/cache/participation_graph/rails/rails</a> That would spit out rails’ participation in the rails repo. <h2>What it means</h2> At the time of this writing, the above url displays something like this: <pre>BsCYA6BPAvAeAnAaAdArAwBHBPCgBwAsArBMBNAxA6AlARA7BZAqAeAyA2BZBhBNARAUAwBrBZAmBDB0BCAZBCBkBaBbAYAvAcA6DcBD AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</pre> The top line contains the total number of commits per week, the bottom line contains the number of commits made by the user. On each line, two characters make up an integer. Encoding is as follows : <ul> <li>‘A’ .. ‘Z’ = 0 .. 25</li> <li>‘a’ .. ‘z’ = 26 .. 51</li> <li>‘0’ .. ‘9’ = 52 .. 61</li> <li>‘!’ = 62</li> <li>‘-’ = 63</li> </ul> Which pretty much means that ‘AA’ is 0, ‘BA’ is 64, and so on. An implementation can be found <a href="http://github.com/zmack/tribby/tree/master/src/ContributionFetcher.as#L55-77">here</a> <h2>Make your own !</h2> So what this really amounts to is that you can pretty much make your own contribution display graph, since you know what the data means and you partially know where to get it from. shameless plug: A decent starting point for this would be <a href="http://github.com/zmack/tribby/tree/master">Tribby</a> which already does the fetching and decoding, so all that’s left is putting the data in a decent form. 2008-06-01T06:36:51-07:00 46 making-sense-of-the-participation-graph-data Making sense of the participation graph data

2009-08-17T01:12:38-07:00

52870

So, you’ve cloned a repository, and hacked away at it; separated it into logical chunks, and it’s now ready to submit! So you send your patch series, or publish your branch, and ask for a pull, but a quick review reveals that there are some errors in these patches! Now, the maintainer may send these patches back to you, and ask you to fix these, this guide shows several ways on how this can be accomplished<a href="#fn1">1</a>. Before you start, make sure you have a clean working tree (i.e. no modified files). <h1>Using rebase -i</h1> This is the most general (and easiest) way to edit history. <h2>Invocation</h2> The syntax is: <pre>git rebase -i <last-good-commit> </pre> For example: <pre>git rebase -i master</pre> This will then take you into your $EDITOR with a file that looks like this: <pre> <code>pick 2394755 FocusedTextEdit: Removed the textCursor function. pick 36369cd Remove Focused* classes in focusedwidgets. pick 3064f94 FocusedTextEdit: Remove the clipboard handling. pick b4d39e3 FocusedTextEdit: Removed the createPopupMenu function. pick 8c0a5eb FocusedTextEdit: fixed constructor. pick 2ea70f5 FocusedEdit: Rewrote wheelEvent to work with the new QAbstractScrollArea <ol> <li>Rebase 96ded8d..2ea70f5 onto 96ded8d #</li> <li>Commands:</li> <li>pick = use commit</li> <li>edit = use commit, but stop for amending</li> <li>squash = use commit, but meld into previous commit #</li> <li>If you remove a line here THAT COMMIT WILL BE LOST.</li> <li>However, if you remove everything, the rebase will be aborted. # </code> </pre></li> </ol> If you change the order of the lines, the commits will be re-ordered. We want to edit a patch, so we mark the commits we want to change as “edit”, and if we want to combine two commits, we mark them as squash<a href="#fn2">2</a>. <pre><code>pick 2394755 FocusedTextEdit: Removed the textCursor function. pick 36369cd Remove Focused* classes in focusedwidgets. edit 3064f94 FocusedTextEdit: Remove the clipboard handling. squash b4d39e3 FocusedTextEdit: Removed the createPopupMenu function. edit 8c0a5eb FocusedTextEdit: fixed constructor. pick 2ea70f5 FocusedEdit: Rewrote wheelEvent to work with the new QAbstractScrollArea </code></pre> Note: “squash” means squash with the commit above it. <h2>Editing and splitting commits</h2> To edit or split commits: <ul> <li>Mark the commit as “edit”</li> <li>Close your editor (the rebase will begin)</li> <li>When rebase reaches a commit marked “edit”, it will stop with a message like this:</li> </ul> <pre><code>Rebasing (3/6) You can amend the commit now, with git commit --amend Once you are satisfied with your changes, run git rebase --continue </code></pre> <ul> <li>Make your changes to the commit, or split the commits</li> <li>add them, and commit with git commit —amend (or use git-gui)</li> <li>type git rebase —continue</li> </ul> <h2>Addendum on splitting commits</h2> I have personally found that the easiest way to split commits is to use “git-gui”. (I should put up a screencast of this) <ol> <li>Open up git gui</li> <li>Click “Amend to last commit”</li> <li>Remove all the files from the commit</li> <li>Click on a file you want to add</li> <li>Right click on the part you want to add in the diff view</li> <li>Click “stage hunk for commit”</li> <li>Repeat for each hunk you want to commit</li> <li>Write a commit message and commit</li> <li>Go to step 3, and repeat until you’ve re-added everything</li> </ol> <h2>Example: squashing “fix” commits.</h2> If your workflow is anything like mine, you’ll find that you’ll find several errors in your commits that you haven’t published yet. In that case, I create a series of fix commits; say I have three commits, Patch A, Patch B, and Patch C; and I see an error in patches A and B: <pre><code>$ edit file1 $ git add file1 $ git commit -m "Fix for Patch A" $ edit file2 $ git add file2 $ git commit -m "Fix for Patch B" $ git rebase -i master </code></pre> This will take me to my text editor with the following file: <pre><code>pick aaaaaa Patch A pick bbbbbb Patch B pick cccccc Patch C pick faaaaa Fix for Patch A pick fbbbbb Fix for Patch B </code></pre> To squash these fixes into your patches A and B (so it looks like you’ve never made the mistake in the first place!), change the file to look like this: <pre><code>pick aaaaaa Patch A squash faaaaa Fix for Patch A pick bbbbbb Patch B squash fbbbbb Fix for Patch B pick cccccc Patch C </code></pre> When rebase —interactive hits a “squash” item, it will send you to your editor to change the commit message (generally, you just have to remove the second commit message) Now you can format your patches again and send them upstream! <h2>Footnotes</h2> 1 If others have branched off of the work you have doing, do not modify any of the commits. The rule in Git is that if you have work that people are working off of, you will make it hell for them if you change it. Rebasing and amending are only for commits where you know no one is working off of. 2 In the upcoming 1.5.6, there will be new rebase -i commands “tag”, “merge”, and “reset”, as well. <h2>References</h2> <ul> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">git-commit documentation</a></li> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html">git-rebase documentation</a></li> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#cleaning-up-history">Git user manual – Cleaning up history</a></li> </ul> 2008-06-01T18:22:42-07:00 47 changing-a-series-of-commits-or-patches Changing a series of commits or patches.

2008-09-14T12:10:41-07:00

21450

Suppose you fork <a href="http://github.com/wycats/merb-core/tree/master">http://github.com/wycats/merb-core/tree/master</a> by clicking on the “fork” button at the top of that page. <img src="http://img.skitch.com/20080303-q2aceaadcqk59kqck4b199bdmh.jpg" alt="" /> (Image from the <a href="http://railsontherun.com/2008/3/3/how-to-use-github-and-submit-a-patch">Rails on the Run tutorial</a>) That copies the repository to your github account, with username <code>username</code> (for example). Once you’ve <a href="http://github.com/guides/providing-your-ssh-key">provided your SSH key</a>, you can <a href="http://github.com/guides/getting-a-copy-of-your-github-repo">check out this remote branch to a directory on your local computer</a> with git’s clone command: <pre class="console"> git clone git@github.com:username/merb-core.git </pre> The above command copies the repository to the directory in which it is run with the following remote reference in your <code>.git/config</code> file<a href="#fn1">1</a>: <pre><code> [remote "origin"] url = git@github.com:username/merb-core.git fetch = +refs/heads/*:refs/remotes/origin/* </code></pre> To also be able to pull in updates from <code>wycats/merb-core</code>, add it to your remote references: <pre class="console"> git remote add wycats git://github.com/wycats/merb-core.git </pre> The above command adds the following remote reference to your <code>.git/config</code> file<a href="#fn1">1</a>: <pre><code> [remote "wycats"] url = git://github.com/wycats/merb-core.git fetch = +refs/heads/*:refs/remotes/wycats/* </code></pre> <h2>Manually Pull from Each Repository</h2> Once the remote branch is created (You only have to do this once.), you can pull in new changes: <pre class="console"> git checkout master git pull wycats master </pre> If you don’t wish for an automatic merge to happen, you can instead fetch and merge: <pre class="console"> git checkout master git fetch wycats git merge wycats/master </pre> <h2>Shortcut: Pull from Both Repositories in One Command</h2> NB: I’m not sure why, but for this shortcut to work for me, I had to first pull manually once (as instructed above). To make things easier, you can create an alias that fetches from <code>origin</code> and <code>wycats</code> and octopus merges them with the current branch on your local machine. Paste the following in your <code>.git/config</code> file<a href="#fn1">1</a>: <pre> [alias] pu = !"git fetch origin -v; git fetch wycats -v; git merge wycats/master" </pre> You can delete both <code>-v</code>‘s, which stand for verbose, if you don’t care for git to explain what’s happening in detail. Now, all you have to type to stay completely up to date is: <pre class="console"> git pu </pre> 1 To get a better understanding of git configuration files, go to the <a href="http://www.kernel.org/pub/software/scm/git/docs/git-config.html">git-config(1) Manual Page</a>, search for “syntax”, and read the first few paragraphs of the “Configuration File” section. Then, skim the “Variables” section to get a sense of what variables you can configure. 2008-06-06T13:39:30-07:00 48 keeping-a-git-fork-in-sync-with-the-forked-repo Keeping a git fork in sync with the forked repo

2009-08-16T09:57:14-07:00

106587

This guide has been moved to <a href="http://help.github.com/mac-git-installation/">help.github.com</a>. You should be redirected momentarily. <script type="text/javascript"> window.location = 'http://help.github.com/mac-git-installation/' </script> 2008-06-13T08:52:03-07:00 50 get-git-on-mac Get git on Mac

2009-08-18T19:19:18-07:00

706

To set certain files or patterns to be ignored by Git, you must either modify the $GIT_DIR/info/exclude file or create a file called <code>.gitignore</code> in your project’s root directory. The former is not shared between repositories (so you can set ignores for your specific environment), while the <code>.gitignore</code> is usually checked into Git and distributed along with everything else. By default $GIT_DIR/info/exclude looks like this: <pre><code># git-ls-files --others --exclude-from=.git/info/exclude # Lines that start with '#' are comments. # For a project mostly in C, the following would be a good set of # exclude patterns (uncomment them if you want to use them): # *.[oa] # *~</code></pre> Both files use the same format for patterns and names. To exclude specific file types, you can add to the bottom: <pre><code>*.log # Will exclude all .log files</code></pre> To exclude all files in a specified path: <pre><code>path/to/ignore/files/* # The path starts at the $GIT_DIR and not '/'</code></pre> You can also explicitly exclude certain files from being ignored by prepending a pattern with <code>!</code>. Let’s say you want to ignore all files starting with a dot, but you don’t want Git to ignore the <code>.gitignore</code> file: <pre><code>.* # Ignore all dotfiles... !.gitignore # except for .gitignore</code></pre> To get more info on this topic, type <code>man gitignore</code> on the command line to call up the manpage. 2008-06-23T07:48:15-07:00 51 ignore-for-git Ignore for Git

2008-06-23T12:13:10-07:00

978

List the remote branches that exist for a repository you have cloned: <code>git remote show origin</code> Create a local branch that tracks one of the remote branches and then use that local branch: <code>git checkout --track -b name_of_local_branch origin/name_of_remote_branch</code> If you have not done a pull since someone else created the remote branch, you may first need to do: <code>git fetch</code> <h4>alternate syntax</h4> <code> git fetch origin remote_branch_name:local_branch_name</code> found that above syntax works if you get this error message: <code> git checkout: updating paths is incompatible with switching branches/forcing Did you intend to checkout 'origin/cms' which can not be resolved as commit? </code> 2008-06-23T08:44:28-07:00 52 showing-and-tracking-remote-branches Showing and tracking remote branches

2009-09-14T11:15:12-07:00

40606

We highly recommend you use the <a href="http://repo.or.cz/w/git.git?a=blob_plain;f=contrib/completion/git-completion.bash;hb=master">git completion</a> file from the contrib dir in git, and put <code>\$(__git_ps1 " %s")</code> somewhere in the PS1 in your .bashrc file, like in <a href="http://gist.github.com/151759">this gist</a>: <script src="http://gist.github.com/151759.js"></script>If you would like a simpler solution, drop the contents of <a href="http://gist.github.com/5129">this gist</a> into your .bashrc file (of course, edit as you see fit). <script src="http://gist.github.com/5129.js"></script>There is also <a href="http://github.com/lvv/git-prompt/">more advanced git prompt</a> (<a href="http://volnitsky.com/project/git-prompt">docs/screenshots</a>), and a cool project for ZSH with something similar called <a href="http://github.com/bkerley/zshkit">zshkit</a> . 2008-06-24T13:05:59-07:00 53 put-your-git-branch-name-in-your-shell-prompt put your git branch name in your shell prompt

2009-08-16T21:05:44-07:00

12983

You can make your README formatted by putting README with specific extension. <h2>Supported Formats</h2> <table> <tr> <th>format </th> <th>extension </th> </tr> <tr> <td> <a href="http://rdoc.rubyforge.org/RDoc.html">rdoc</a> </td> <td> README.rdoc </td> </tr> <tr> <td> <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a> </td> <td> README.markdown, README.md, README.mdown, README.mkd, README.mkdn</td> </tr> <tr> <td> <a href="http://hobix.com/textile/">Textile</a> </td> <td> README.textile </td> </tr> <tr> <td> PNG </td> <td> README.png (will display the image) </td> </tr> <tr> <td> <a href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> </td> <td> README.rst </td> </tr> <tr> <td> (no formatting) </td> <td> README.* (all but above extensions), README (no extension) </td> </tr> </table> <h2>Unsupported Formats</h2> <ul> <li>rd (README.rd)</li> <li>html (README.html — considered insecure)</li> </ul> <h2>Notes</h2> <ul> <li>If there is both README and README.foo, README.foo is displayed.</li> <li>feature request: <a href="http://logicalawesome.lighthouseapp.com/projects/8570/tickets/38-format-readmes-without-an-extension"> format READMEs without an extension</a></li> <li>feature request: <a href="http://en.wikipedia.org/wiki/Plain_Old_Documentation">POD</a></li> <li>feature request: <a href="http://www.methods.co.nz/asciidoc/">AsciiDoc</a></li> <li>feature request: TiddlyWiki Syntax</li> <li>feature request: Something MediaWiki like such as <a href="http://mediacloth.rubyforge.org/">MediaCloth</a> or <a href="https://rubyforge.org/projects/wikicreole/">WikiCreole</a></li> <li>feature request: <a href="http://txt2tags.sourceforge.net">txt2tags</a></li> <li>reStructuredText: there are certain, specific kinds of content that will cause the .rst renderer to fail. In particular, certain non-latin unicode glyphs will cause README.rst’s to not render on github while rendering perfectly happily using rst2html.py. If your README.rst will not render, try looking for unusual content in your .rst and stripping it out, and seeing if that has an effect.</li> </ul> 2008-07-03T00:13:34-07:00 54 readme-formatting README Formatting

2009-11-05T20:17:11-08:00

83137

This guide was moved to [[Compiling and installing git on Mac OS X]] 2008-07-11T13:16:22-07:00 55 compiling-git-on-os-x-leopard Compiling git on OS X Leopard

2009-02-16T20:48:04-08:00

706

<h2>What if my GitHub repository is corrupted or deleted?</h2> Don’t Panic! Because of the distributed nature of git, everyone always has a local full copy of the repository, complete with history. Any of your repositories, assuming they have been kept up to date, can be uploaded to the GitHub repository with no loss of data. If the universe is conspiring against you and all copies of your repository are unaccessible, just email support@github.com – we keep offsite, encrypted backups of all repositories. <h2>How can I share my repository if GitHub goes down?</h2> Luckily, git has a <a href="http://www.kernel.org/pub/software/scm/git/docs/git-daemon.html">built in server</a> for sharing git repositories. If you have several repositories in your Code directory: <pre> /Users/Matt/Documents/Code/ rbvimeo/ rubyzilla/ </pre> You can serve all of these with the following command: <pre class="console"> git daemon —base-path=/Users/Matt/Documents/Code/ —export-all </pre> The repositories can then be cloned using the address of your computer <pre class="console"> git clone git://127.0.0.1/rbvimeo git clone git://127.0.0.1/rubyzilla </pre> Note: The default port git uses is 9418. Make sure that your firewall is set up to handle this. <h2>How can I get a quick web interface?</h2> You can run git instaweb to quickly start a network-accessible gitweb interface, for example: <pre class="console"> git instaweb —httpd=webrick </pre> <h2>How do I deploy my application with Capistrano when GitHub is down?</h2> There are quite a few ways to deploy without github… ah the wonders of git! <h3>Deploy from a local git server</h3> Set up your repositories to be shared using git-daemon as detailed above. Set your capistrano config files to point the repository to your local repository: <pre> set :repository, “git://YOUR_IP/rails-app” </pre> You can now deploy your repository as normal. <h3>Push over ssh</h3> Another handy trick is to push the repo to your deploy server over ssh, then deploy using the local path. For this to work, you need ssh access to your deploy server, of course. <pre class="console"> scp -r myrepo.git ssh://myuser@myserver.com/~/myrepo.git git remote add deployserver ssh://myuser@myserver.com/~/myrepo.git git push deployserver master </pre> Assuming your users are stored in <code>/home</code>… <pre class="console"> set :repository, "/home/myuser/myrepo" set :local_repository, "#{File.dirname(__FILE__)}/../" </pre> 2008-07-14T09:24:08-07:00 56 disaster-faq-what-to-do-when-github-goes-bad Disaster FAQ: What to do when GitHub goes bad

2008-11-17T12:31:40-08:00

2720

Check the Troubleshooting instructions at <a href="http://gems.github.com/">http://gems.github.com/</a>. 2008-07-14T12:15:12-07:00 57 why-won-t-my-rubygem-build Why won't my RubyGem build?

2008-07-14T12:19:16-07:00

5656

See <a href="http://www.kernel.org/pub/software/scm/git/docs/git-tag.html">git-tag</a> on how to create a tag. E.g: <pre class="console">$ git tag -a -m "tagging version 1.0" 1.0</pre> Use git-push with the —tags option to push them to the remote (github in this case). <pre class="console">$ git push --tags</pre> You can also push a single tag: <pre class="console">$ git push origin tag name-of-tag</pre> <h2>Sign your tags with GPG for increased security</h2> You may want to sign your tag with your GPG key for improved security. Assuming you have setup GPG correctly on your system, you use the following command instead of the one mentioned above. You can push your tags as normal. <pre class="console">$ git tag -s -m "tagging version 1.0" 1.0</pre> Later you may validate the tag: <pre class="console">$ git tag -v 1.0</pre> <h2>Delete existing tags</h2> Deleting a tag locally is as simple as: <pre class="console">$ git tag -d "1.0"</pre> To push the deletion to GitHub: <pre class="console">$ git push origin :refs/tags/1.0</pre> 2008-07-17T06:03:08-07:00 58 push-tags-to-github Push tags to github

2009-09-10T08:02:34-07:00

2651

We are in the process of moving guides to <a href="http://help.github.com/">help.github.com</a>. If you can’t find the guide you are looking for here, check to see if it’s been moved already. <h2>Setting Up</h2> <ul> <li>[[Addressing authentication problems with SSH]]</li> <li>[[How to not have to type your password for every push]]</li> <li>[[How to transparently clone from github with ssh tunnels]] <ul> <li>[[How to clone from github with ssh tunnels|Another method of setting up tunnels]]</li> </ul></li> </ul> <h2>Working with git</h2> <ul> <li>[[Git Screencasts]]</li> <li>[[Git Podcasts]]</li> </ul> <h3>Git for Mac</h3> <ul> <li>[[Compiling and installing git on Mac OS X]]</li> <li>[[Setting up a remote repository using GitHub and OSX]]</li> <li>[[Issues with TextMate set as git editor]]</li> </ul> <h3>Git for Windows</h3> <ul> <li>[[Using Git and GitHub for the Windows for newbies]]</li> <li><a href="http://beans.seartipy.com/2008/12/09/setting-up-ruby-on-rails-projects-with-git-and-github/">Setting up a project with Git and GitHub</a></li> </ul> <h3>Cross-platform Git</h3> <ul> <li>[[Using the EGit Eclipse Plugin with GitHub]]</li> </ul> <h3>Importing existing projects</h3> <ul> <li>[[Import from Subversion]]</li> <li>[[Changing Your Origin]]</li> <li>[[Jump to github from your repository]]</li> </ul> <h3>Everyday git</h3> <ul> <li>[[Git Cheat Sheet]]</li> <li>[[Remove a remote branch]]</li> <li>[[Cool and unusual Git techniques]]</li> <li>[[Changing a series of commits or patches.]]</li> <li>[[Completely remove a file from all revisions]]</li> <li>[[Change author details in commit history]]</li> <li>[[put your git branch name in your shell prompt]]</li> <li>[[Ignore for Git]]</li> </ul> <h3>Remotes</h3> <ul> <li>[[Push a Branch to GitHub]]</li> <li>[[Push tags to github]]</li> <li>[[Dealing with errors when pushing]]</li> <li>[[Showing and tracking remote branches]]</li> <li>[[Keeping a git fork in sync with the forked repo]]</li> <li>[[Using git submodules to track plugins]]</li> <li>[[Developing with Submodules]]</li> </ul> <h2>Working with GitHub</h2> <ul> <li>[[Getting a copy of your github repo]]</li> <li>[[Pull Requests]]</li> <li>[[Textile Formatting]]</li> <li>[[Managing collaborators]]</li> <li>[[How do I delete a repository?]]</li> <li>[[Fork a project and submit your modifications]]</li> <li>[[Managing multiple clients and their repositories]]</li> <li>[[Multiple GitHub Accounts]]</li> <li>[[How to move a repo to another account]]</li> <li>[[Import an existing git repo]]</li> <li>[[README Formatting]]</li> <li>[[Making sense of the participation graph data]]</li> <li>[[Dealing with firewalls and proxies]]</li> <li>[[GitHub and Firefox Ubiquity]]</li> <li>[[Pages]]</li> <li>[[Working with the Issue Tracker]]</li> <li><a href="http://github.github.com/github-flavored-markdown/" title="comments syntax">GitHub flavored markdown</a></li> </ul> <h2>Deploying</h2> <ul> <li>[[Deploying with Capistrano]]</li> <li>[[Understanding deploy keys]]</li> </ul> <h2>Bugs and Feature Requests</h2> <ul> <li>[[Disaster FAQ: What to do when GitHub goes bad]]</li> <li>[[Feature Requests]]</li> <li>[[GitHub Bugs!]]</li> <li>[[‘percent_expand: NULL replacement’ Bug]]</li> <li>[[I’m missing my Gravatar icon on my commits]]</li> <li>[[Syntax highlighting isn’t working for my language]]</li> <li>[[Why won’t my RubyGem build?]]</li> <li>[[Why aren’t my commits shown in blue in the 52 Week Participation graphs?]]</li> </ul> <h2>Developers</h2> <ul> <li><a href="http://github.com/guides/local-github-config">Local GitHub Config</a></li> <li><a href="http://github.com/blog/170-token-authentication">Token Authentication</a></li> <li>[[The GitHub API]]</li> </ul> 2008-07-22T14:11:01-07:00 59 home Home

2009-10-16T20:07:39-07:00

706

This guide has been moved to <a href="http://help.github.com/moving-a-repo/">help.github.com</a>. You should be redirected momentarily. <script type="text/javascript"> window.location = 'http://help.github.com/moving-a-repo/' </script> 2008-07-22T15:21:33-07:00 60 how-to-move-a-repo-to-another-account How to move a repo to another account

2009-08-18T19:21:02-07:00

706

<h2>It says “error: failed to push to ‘git://github.com/me/myrepo.git’” when I push. What gives?</h2> Addresses that start with git:// are read only. In order to push, you must use the “git@github.com:me/myrepo.git” address listed as “Push URL” in the repo info for your repository. <h2>error: “failed to push some refs to ’git@github.com:me/myrepo.git”</h2> <h3>As a consequence of rewriting history or reset-ing to not current head</h3> You might get this error after rewriting history in your local repo or reset-ing to not current head. Try to run <code>git pull</code> first. If it doesn’t work and your tree looks (<code>gitk --all</code>) like: <pre> A—B—C <— master / o—o—X \ Y-Z <— remotes/origin/master </pre> try to rewrite it with (assuming you’re on the master branch): <pre> git rebase origin/master </pre> which should make: <pre> A’—B’—C’ <— master / o—o—X—Y—Z <— remotes/origin/master </pre> If you’re absolutely sure that your local branch is the correct one and you want to drop all diverging commits on the remote, you can use the following command. Warning: this will not only destroy the history on the remote, it might also give an error message to anyone who updates from the same remote (depending on how much history you rewrite). Use this only as the very last resort. <pre> git push —force origin master </pre> <h3>As a consequence of renaming branches clashing with existing branches</h3> Let us say you have a local branch ‘demo’ which has been pushed to github. You can rename the local branch from ‘demo’ to ‘demo/base’ and try pushing that and you will get an error like this: <pre> error: 'refs/heads/demo' exists; cannot create 'refs/heads/demo/base' error: failed to lock refs/heads/demo/base To git@github.com:user/repos.git ! [remote rejected] demo/base -> demo/base (failed to lock) error: failed to push some refs to 'git@github.com:user/repos.git' </pre> The trick is to delete the origin/demo branch (assuming ‘origin’ is github) first before pushing: <pre> $ git push origin :demo $ git push origin demo/base </pre> <h2>error: src refspec <foo> does not match any.</h2> this is followed by the previous “failed to push some refs” error, which looks coincidental here. Forcing didnt help either. 2008-07-22T15:31:02-07:00 61 dealing-with-errors-when-pushing Dealing with errors when pushing

2009-08-14T03:30:04-07:00

10751

We use the excellent <a href="http://pygments.org/">pygments</a> library for our syntax highlighting. Check their list of <a href="http://pygments.org/languages/">supported languages</a> and learn how to specify a lexer for yours. If you contribute a lexer back to pygments, let us know and we’ll make sure it’s made available here on github. 2008-07-22T15:34:51-07:00 62 syntax-highlighting-isn-t-working-for-my-language Syntax highlighting isn't working for my language

2008-07-22T15:34:51-07:00

706

In order to match you with your commits, we compare your github.com email addresses with the email address in each commit. If you committed under a different email address, you will not be given credit for those commits. You can add more email addresses on your account page. 2008-07-22T15:35:51-07:00 63 why-aren-t-my-commits-shown-in-blue-in-the-52-week-participation-graphs Why aren't my commits shown in blue in the 52 Week Participation graphs?

2008-07-22T15:35:51-07:00

706

<h2>Why am I getting “fatal: no commit message? aborting commit.”?</h2> Git needs to wait for TextMate to close the commit log message file. You do so by using “mate -w”. There are many ways to set the editor that git uses; according to the git docs: “The editor used to edit the commit log message will be chosen from the GIT_EDITOR environment variable, the core.editor configuration variable, the VISUAL environment variable, or the EDITOR environment variable (in that order).” You can set it like so: <code>git config --global core.editor "mate -w"</code> 2008-07-22T15:42:42-07:00 64 issues-with-textmate-set-as-git-editor Issues with TextMate set as git editor

2009-08-27T21:46:59-07:00

43212

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 <h2>One account, multiple collaborators</h2> This design lets you retain control over the repos, but still gives your clients access to them. This is the simplest (and cheapest) approach. Simply create one account with a plan that provides enough private repos to cover all your projects. If your client needs access to the source code, have them create a free account. You can then add their free account as a collaborator on the projects you wish for them to have access to. If you wish, you can even bill your clients for the cost of your account, and maintaining their repos on it! <h2>Multiple accounts, one collaborator</h2> This design gives the control over the repos (and the bill) to your client, but still allows you to push into all your clients’ repos from a single account. With this design, have your clients each open their own paid account and create empty repos for each project. Add your account to the repos as a collaborator. You can now push to their repos as if they were your own! <h2>Multiple accounts, no collaborators</h2> This is by far the most complicated setup, and should be avoided if at all possible. If, for whatever reason, you must push to each client’s repos using their account, this is the setup you will have to use. Instructions on this design are detailed in the [[Multiple GitHub Accounts]] guide. 2008-08-01T15:39:55-07:00 66 managing-multiple-clients-and-their-repositories Managing multiple clients and their repositories

2009-03-11T13:40:33-07:00

706

This guide has been moved to <a href="http://help.github.com/git-email-settings/">help.github.com</a>. You should be redirected momentarily. <script type="text/javascript"> window.location = 'http://help.github.com/git-email-settings/' </script> 2008-08-12T13:37:50-07:00 67 tell-git-your-user-name-and-email-address Tell git your user name and email address

2009-08-18T13:58:49-07:00

706

This guide has been moved to <a href="http://help.github.com/dealing-with-lineendings/">help.github.com</a>. You should be redirected momentarily. <script type="text/javascript"> window.location = 'http://help.github.com/dealing-with-lineendings/' </script> 2008-08-21T13:15:58-07:00 68 dealing-with-newlines-in-git Dealing with newlines in git

2009-10-05T01:10:59-07:00

706

Deploy keys are a handy yet misunderstood feature here on github. This guide will try to lay out when and how to use them instead of normal user keys. <h2>What are deploy keys?</h2> Deploy keys are ssh keys just like the ones you attach to your account to allow you to push to and pull from your repos. The key difference is that deploy keys are designed to allow access to a single private repo. This is intended for use on your staging or production server to pull in from your repo, most likely using a deploy tool like <a href="http://www.capify.org/">Capistrano</a>. Remember, keys are unique, you cannot use the same key on two repos, or on a repo and a user account. <h2>When should I use a deploy key?</h2> Simple, when you have a server that needs pull access to a single private repo. <h3>I’m working with public repos, do I still need deploy keys?</h3> No! You can simply use the public clone URL for the project. <h3>My server needs access to many private repos, how do I handle this?</h3> <h4>The best way</h4> The best way is to add your server’s key to the account for the repos’ owner. This will allow the server access to any private repo that user owns or is a collaborator on. <h4>Create a server specific account</h4> If you don’t want your deploy server to have access to every repo, you can make an account specifically for the server, attach its key to the account, and add that account as a collaborator to any repo you do want access to. Another option is to use multiple deploy keys and employ the technique described in the [[Multiple GitHub Accounts]] guide. Note that this method is somewhat complicated. <h4>Use SSH config file</h4> Open <pre><code>~/.ssh/config</code></pre> Add the following lines: <pre><code>Host project1 User git Hostname github.com IdentityFile [local path to private key half of github public key you provided] </code></pre> Then for the git clone command use project1 instead of github.com <pre><code>git clone git@project1:user/project.git</code></pre> <h2>Further reading</h2> <ul> <li>[[Providing your SSH Key]]</li> <li>[[Deploying with Capistrano]]</li> <li>[[Multiple GitHub Accounts]]</li> </ul> 2008-08-28T15:30:20-07:00 69 understanding-deploy-keys Understanding deploy keys

2008-12-16T23:56:25-08:00

3761

<h2>This guide was moved to [[Managing collaborators]]</h2> 2008-11-11T17:19:14-08:00 73 removing-a-collaborator-from-a-repo Removing a collaborator from a repo

2009-01-23T14:13:14-08:00

706

Ah corporate networks, such a pain. Are you stuck behind a firewall or proxy and can’t git to github? Here’s a few guides to help: <ul> <li><a href="http://blog.codeslower.com/2008/8/Using-PuTTY-and-SSL-to-securely-access-GitHub-repositories-via-SSH" title="port 443">Connecting to github over HTTPS</a></li> <li><a href="http://dilipm79.blogspot.com/2008/11/why-i-love-git-and-github.html">Specific instructions on pushing over HTTPS if behind a corporate firewall</a></li> <li><a href="http://github.com/blog/92-http-cloning">HTTP cloning</a></li> <li>[[How to transparently clone from github with ssh tunnels]]</li> <li><a href="http://returnbooleantrue.blogspot.com/2009/06/using-github-through-draconian-proxies.html" title="Windows And Unix">Using Github Through Draconian Proxies</a></li> </ul> 2008-11-12T16:14:00-08:00 74 dealing-with-firewalls-and-proxies Dealing with firewalls and proxies

2009-06-19T13:12:17-07:00

706

If you are using Firefox, and you have the Ubiquity plugin installed, a few awesome GitHub users have contributed Ubiquity commands for searching the GitHub site – there is one for searching Git repositories and another for using the code search. You can install Ubiquity <a href="https://wiki.mozilla.org/Labs/Ubiquity">here</a> You can subscribe to the repository search command <a href="http://gist.github.com/19081">here</a> And you can subscribe to the code search command <a href="http://gist.github.com/26061">here</a> Thanks to Tim Gossett and Bastos for these commands. 2008-11-19T10:50:22-08:00 76 github-and-firefox-ubiquity GitHub and Firefox Ubiquity

2009-01-27T06:42:41-08:00

48976

<h2>First, a warning</h2> EGit/JGit is a reimplementation of git in java, due to this GitHub does not officially support it. Issues have happened and repositories have been corrupted by them. While it is usually a simple matter to repair these repos due to git’s distributed nature, be aware that EGit may not work as well as the official git binaries. GitHub officially supports msysgit (openssh) on windows and precompiled or self-compiled binaries on mac and linux. The following guide was submitted by a user and may be out of date. <hr> Here’s one way to bring Github into <a href="http://www.eclipse.org">Eclipse</a>. I’ll immediately declare myself as a newbie with both git and Github. There might be smarter and better ways to do things. If you know of them, please edit this guide and correct/add as appropriate. I’ll also try to keep this guide focused on EGit. Installing Git on your OS and setting up your Github account and other issues are covered in the excellent Github <a href="http://github.com/guides">guides section</a>. Actually I think there’s not much (if anything) particular in using EGit with Github, but it’s a fitting context on this site, wouldn’t you agree? Further, I’m going to assume you’re working with a repository you can push to. <h2>What’s EGit anyway?</h2> <a href="http://git.or.cz/gitwiki/EclipsePlugin">EGit</a> is an Eclipse plugin that uses a pure Java implementation of Git (<a href="http://www.jgit.org">JGit</a>) to enable Eclipse projects to be controlled by a Git repository. EGit is under rapid development, I’m currently using version 0.3.1.20081024. As an Eclipse source control plugin it’s not complete yet, but it has a lot going for it and gives you some goodies and visual clues on the state of your branch. Egit has moved to the eclipse project recently, integration snapshots are still available at the jgit.org update site mentioned below. <h2>Installing EGit</h2> Googling on the subject you easily get the impression that the way to install Egit is to download the source and build it yourself. But if you’re a bit more lazy than that you can add the EGit <a href="http://www.jgit.org/updates">update site</a> to Eclipse and install it like any other plugin. That’s what the <a href="http://www.jgit.org/">JGit site</a> suggests. That’s what I did. <h2>Get your Eclipse project Git controlled</h2> With the CVS and Subversion plugins I’ve used you can import a project from the source repository, and that’s what I tried to do with EGit too, but I can’t get it to work. Here’s what I do to work around that. The first step differs depending on if your uploading your project from Eclipse to Github or if your importing it from Github into Eclipse. <h3>1a: Uploading your Eclipse project to Github</h3> With a freshly created Github repository follow the instructions on how to set it up, except instead of making a new directory you cd to the root directory of your Eclipse project. <h3>1b: Importing an existing Eclipse project from Github. <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/8da868a8-dff5-48a1-b0c1-81a34655911c/00000010.png" alt="" /> Import the project from Github using Eclipse’s Import feature.</h3> <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/50e09d79-6b19-4bee-9ec6-eef17916adae/00000011.png" alt="" /> Next enter the repository URL as represented on Github: <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/f560a049-e65d-48aa-8be3-7ff5b007da0d/00000012.png" alt="" /> You only need to fill the URI field. EGit will parse it and fill the other fields for you. You’ll be identifying using your ssh key so there’s no password needed for the git user. Unfortunately, the EGit plugin no longer parses git@github.com URLs correctly. Make sure to choose the git+ssh protocol and enter github.com as your host, correct the path and the URL will be adjusted accordingly. The resulting URL will look like this: git+ssh://git@github.com/<user>/<repository>.git (TODO: update screenshot!) Then click Next and when EGit looks for the available branches it’ll ask for your ssh key pasword: <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/3dbe00a1-f25d-4fa2-9e77-7ed1fd3f659b/00000013.png" alt="" /> (2009/10/17 – error message: SSH2 Message – The authenticity of host ‘github.com’ can’t be established. <a href="http://code.google.com/p/egit/issues/detail?id=104">solution</a> ) Then select the branch to check out and after clicking Next it’s time to choose where you want to clone the project to. Your Eclipse workspace works, but it’s not a requirement. <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/2065c21d-0c78-4468-b79d-d29bcad76846/00000014.png" alt="" /> Then click Finish. The project won’t show up in Eclipse yet, at least not with the version of EGit I’m using. (Because of this you can also choose to clone it using command line git instead.) Then you need to Import it into Eclipse from the directory where you cloned it to. Looks like so for a Flex project: <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/ed403bca-39f0-44df-8c3a-cf28d7f1c353/00000003.png" alt="" /> <h3>2: Make Eclipse aware of the project’s Gitness</h3> OK, so you have an Eclipse project under git control, hosted on Github. But Eclipse doesn’t know it yet. Here’s how to fix that: 1. From the Eclipse project context menu choose Team→Share <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/018174fe-5753-4e57-9034-33d75d92f143/00000002.png" alt="" /> 2. Choose the Git repository type. <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/93e9bb05-023a-46e7-aa06-b021cd774910/00000004.png" alt="" /> 3. Select Search for existing Git repositories <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/860c529b-d7dc-4b3c-90ae-4c5600858aa8/00000005.png" alt="" /> Done! It’s actually very few steps, just verbosely described. <h2>Git operations from inside Eclipse <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/1ab078c8-5911-42e1-97be-34a091a75de5/00000006.png" alt="" /></h2> Cool, so now you have EGit going. The project Team submenu now looks much more interesting. As I’m not kidding when I’m saying I’m a Git newbie I don’t dare advise much on how to actually use EGit. All I’ve tried so far is Add, Commit and Push on some test projects that I own myself and where I have no collaborators. <h3>Pushing your changes <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/e553dcd7-4583-4fda-b981-c643b60b98a7/00000007.png" alt="" /></h3> The wizard for pushing changes is a bit confusing to me (because of my lacking Git understanding). Anyway, this works for me so far: At the first step I just click next, accepting the default repository config (should be the Github repo). <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/912c19bb-3878-4401-a1aa-fd8e80202089/00000008.png" alt="" /> Next step is quite crowded. I guess once you’ve branched and such it’ll seem clearer. But as long as you’re working in the master branch all on your own it seems to work doing like the following pic suggests: <img src="http://content.screencast.com/users/CoBPEZ/folders/Jing/media/d5adf911-4c23-4fe9-b4fa-3057035d71be/00000009.png" alt="" /> Hopefully I’ll get some Gitting under my belt soon enough and can get back to updating this guide some. Of course, feel invited to edit this guide with any knowledge you have on the subject. 2008-11-23T15:19:21-08:00 77 using-the-egit-eclipse-plugin-with-github Using the EGit Eclipse Plugin with GitHub

2009-10-19T08:56:18-07:00

119844

Simple shell script to edit author details: <script src="http://gist.github.com/45856.js"></script> 2008-11-23T15:21:26-08:00 78 change-author-details-in-commit-history Change author details in commit history

2009-01-11T18:17:07-08:00

45696

Setting a local GitHub config tells apps like <a href="http://github.com/Caged/gitnub">GitNub</a> and <a href="http://github.com/pieter/gitx">GitX</a> who you are. When logged in, your <a href="http://github.com/account">account page</a> provides simple copy & paste instructions for setting the config. <img src="http://img.skitch.com/20081126-i39uhamy7yjpema5jb6aaab4f.png" alt="" /> <img src="http://img.skitch.com/20081126-cmt7w2tr3w1sss3wxu3jhg1rsd.png" alt="" /> Applications and scripts can easily access this information: <pre> $ git config --global github.user defunkt </pre> You can also access ~/.gitconfig directly. <h3>Keep Your Token Secret</h3> It’s like your password – please keep it secret. Also: whenever you change your password, your token will also change. So if your token gets out, change your GitHub password and you will be fine. 2008-11-25T16:55:16-08:00 79 local-github-config Local GitHub Config

2008-11-25T17:05:15-08:00

<a href="http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html">Git Submodules</a> are actually pretty great. Here’s a simple way to manage submodule development from within an open source project. Say there’s an Awesome Framework, and you want to write an open source plugin for it. First create the plugin. (the ‘gh’ command comes from the <a href="http://github.com/defunkt/github-gem">Github gem</a>) <pre> $ gh create my-fantastic-plugin </pre> Next clone the framework. <pre> $ gh clone defunkt/my-awesome-framework $ cd my-awesome-framework </pre> Now add your plugin as a submodule to the framework. <pre> $ gh submodule add git://github.com/defunkt/my-fantastic-plugin.git plugins/my-fantastic-plugin </pre> Next <code>cd</code> into the plugin and add your private URL as a remote. <pre> $ cd plugins/my-fantastic-plugin $ gh remote add push git@github.com:defunkt/my-fantastic-plugin.git </pre> And that’s it. Make changes from within <code>my-awesome-framework/plugins/my-fantastic-plugin</code> and, when you’re ready, just <code>gh push push master</code>. Best of all: people cloning your <code>my-awesome-framework</code> fork will have no problem pulling down your <code>my-fantastic-plugin</code> submodule, as you’ve registered the public clone URL for the submodule. The commands <pre> $ gh submodule init $ gh submodule update </pre> Will pull the submodules into the current repository. This is how I develop <a href="http://github.com/defunkt/textmate.el">textmate.el</a> from within my <a href="http://github.com/defunkt/emacs/tree/master/vendor">Emacs config</a> while keeping the submodule URL public. <img src="http://img.skitch.com/20081126-qrn7p5xwmsi65d4sxdt83bc9u7.png" alt="" /> Check out <a href="http://github.com/defunkt/my-awesome-framework">my-awesome-framework</a> to see this Guide’s example in action. If you are deploying an application with capistrano and you want to use submodules. <pre> set :git_enable_submodules, 1 </pre> 2008-11-25T18:31:27-08:00 80 developing-with-submodules Developing with Submodules

2009-08-18T07:49:26-07:00

71336

What type of events will show up in the news feed? CommitCommentEvent CommitEvent CreateEvent DeleteEvent FollowEvent ForkApplyEvent ForkEvent GistEvent GitHubEvent GuideEvent MemberEvent PushEvent WatchEvent WikiEvent 2008-12-17T18:17:06-08:00 81 dashboard-events Dashboard Events

2008-12-17T18:17:25-08:00

GitHub Pages are a way to setup a static page for your user or project on GitHub. <h3>For the most up-to-date info on Pages, visit <a href="http://pages.github.com/">http://pages.github.com/</a></h3> 2008-12-22T15:37:11-08:00 82 pages Pages

2009-04-29T14:08:00-07:00

706

<a href="http://rebase.github.com/howto.html">This page has moved.</a> 2008-12-30T04:52:49-08:00 83 rebase-howto Rebase HOWTO

2009-06-29T15:49:22-07:00

12610

<a href="http://sohbeti.info/">sohbet</a> yapacaginiz bir mekanda sizlere en guzel inkani taniyoruz <a href="http://www.netlog.gen.tr/">netlog</a> arkadaslik sistemi dunyaca unlu arkadas bulma sitesi <a href="http://www.bayanarkadas.info/"> bayan</a> arkadas ariyorsaniz hemen msn adrsinizi yazin bayanlarla konusmaya baslayin <a href="http://www.bayanarkadas.info/">kiz</a> arkadas mı arıyorsunuz ne duruyorsunuz ozmaan tam sizin istediginiz gibi bedava free bir site <a href="http://www.bayanarkadas.info/"> arkadas</a> yanlizmisin her turden arkadaslik imkani evli bekar dul bosanmıs ayrılmıs yanliz nasıl istersen sexi olanida var <a href="http://www.sohbeti.info/">sohbet odalari</a> 2009-01-15T01:23:22-08:00 84 sohbet-turkce-sohbet-odalari sohbet turkce sohbet odalari

2009-01-15T01:23:22-08:00

46746

<h2>Opening the repo admin page</h2> <h3>From your dashboard, click the repo you wish to edit</h3> <img src="http://farm4.static.flickr.com/3462/3221303012_b65067aa58.jpg?v=0" /> <h3>Click “edit” or “Admin”</h3> <img src="http://farm4.static.flickr.com/3110/3221307362_d2b49a8194.jpg?v=0" /> <h2>Adding a collaborator</h2> <h3>In the repo admin page, click “Add another collaborator”</h3> <img src="http://farm4.static.flickr.com/3396/3220459807_33c59ec24c.jpg?v=0" /> <h3>Type in the user’s name, or part of it, select the user in the list, click “Add”</h3> <img src="http://farm4.static.flickr.com/3302/3221311614_695359ded2.jpg?v=0" /> <h2>Removing a collaborator</h2> <h3>Open the repo admin page, find the collaborator you wish to remove, click “revoke”</h3> <img src="http://farm4.static.flickr.com/3477/3220461617_45dff379f2.jpg?v=0" /> 2009-01-23T14:12:18-08:00 85 managing-collaborators Managing collaborators

2009-01-23T14:12:18-08:00

706

<h2>Setting Up</h2> <ul> <li>[[Tell git your user name and email address]]</li> <li>[[Providing your SSH Key]]</li> <li>[[Addressing authentication problems with SSH]]</li> <li>[[How to not have to type your password for every push]]</li> <li>[[How to clone from github with ssh tunnels]]</li> </ul> <h2>Working with git</h2> <ul> <li>[[Git Screencasts]]</li> <li>[[Git Podcasts]]</li> </ul> <h3>Git for Mac</h3> <ul> <li>[[Compiling git on OS X Leopard]]</li> <li>[[Get git on Mac]]</li> <li>[[Setting up a remote repository using GitHub and OSX]]</li> <li>[[Issues with TextMate set as git editor]]</li> </ul> <h3>Git for Windows</h3> <ul> <li>[[Using Git and GitHub for the Windows for newbies]]</li> <li><a href="http://beans.seartipy.com/2008/12/09/setting-up-ruby-on-rails-projects-with-git-and-github/">Setting up a project with Git and GitHub</a></li> <li>[[Dealing with newlines in git]]</li> </ul> <h3>Cross-platform Git</h3> <ul> <li>[[Using the EGit Eclipse Plugin with GitHub]]</li> </ul> <h3>Importing existing projects</h3> <ul> <li>[[Import from Subversion]]</li> <li>[[Changing Your Origin]]</li> <li>[[Jump to github from your repository]]</li> </ul> <h3>Everyday git</h3> <ul> <li>[[Git Cheat Sheet]]</li> <li>[[Remove a remote branch]]</li> <li>[[Cool and unusual Git techniques]]</li> <li>[[Changing a series of commits or patches.]]</li> <li>[[Completely remove a file from all revisions]]</li> <li>[[Change author details in commit history]]</li> <li>[[put your git branch name in your shell prompt]]</li> <li>[[Ignore for Git]]</li> </ul> <h3>Remotes</h3> <ul> <li>[[Push a Branch to GitHub]]</li> <li>[[Push tags to github]]</li> <li>[[Dealing with errors when pushing]]</li> <li>[[Showing and tracking remote branches]]</li> <li>[[Keeping a git fork in sync with the forked repo]]</li> <li>[[Using git submodules to track plugins]]</li> <li>[[Developing with Submodules]]</li> </ul> <h2>Working with GitHub</h2> <ul> <li>[[Getting a copy of your github repo]]</li> <li>[[Pull Requests]]</li> <li>[[Textile Formatting]]</li> <li>[[Managing collaborators]]</li> <li>[[How do I delete a repository?]]</li> <li>[[Fork a project and submit your modifications]]</li> <li>[[Managing multiple clients and their repositories]]</li> <li>[[Multiple GitHub Accounts]]</li> <li>[[How to move a repo to another account]]</li> <li>[[Import an existing git repo]]</li> <li>[[README Formatting]]</li> <li>[[Making sense of the participation graph data]]</li> <li>[[Dealing with firewalls and proxies]]</li> <li>[[GitHub and Firefox Ubiquity]]</li> <li>[[Pages]]</li> </ul> <h2>Service Hooks</h2> <ul> <li>[[Post-Receive Hooks]]</li> <li>[[Integrating git commit messages in Lighthouse]]</li> <li>[[Lighthouse Post-Commit Hook]]</li> </ul> <h2>Deploying</h2> <ul> <li>[[Deploying with Capistrano]]</li> <li>[[Understanding deploy keys]]</li> </ul> <h2>Bugs and Feature Requests</h2> <ul> <li>[[Disaster FAQ: What to do when GitHub goes bad]]</li> <li>[[Feature Requests]]</li> <li>[[GitHub Bugs!]]</li> <li>[[‘percent_expand: NULL replacement’ Bug]]</li> <li>[[I’m missing my Gravatar icon on my commits]]</li> <li>[[Syntax highlighting isn’t working for my language]]</li> <li>[[Why won’t my RubyGem build?]]</li> <li>[[Why aren’t my commits shown in blue in the 52 Week Participation graphs?]]</li> </ul> <h2>Developers</h2> <ul> <li><a href="http://github.com/guides/local-github-config">Local GitHub Config</a></li> <li><a href="http://github.com/blog/170-token-authentication">Token Authentication</a></li> <li>[[The GitHub API]]</li> </ul> 2009-02-08T19:20:20-08:00 86 zh_tw_home zh_TW_home

2009-02-08T19:20:20-08:00

42607

<h2>設定</h2> <ul> <li><a href="http://github.com/guides/gitemail">在git中設定您的使用者與email位址</a></li> <li>[[Providing your SSH Key]]</li> <li>[[Addressing authentication problems with SSH]]</li> <li>[[How to not have to type your password for every push]]</li> <li>[[How to clone from github with ssh tunnels]]</li> </ul> <h2>在git上面工作</h2> <ul> <li>[[Git Screencasts]]</li> <li>[[Git Podcasts]]</li> </ul> <h3>在Mac上面使用Git</h3> <ul> <li>[[Compiling git on OS X Leopard]]</li> <li>[[Get git on Mac]]</li> <li>[[Setting up a remote repository using GitHub and OSX]]</li> <li>[[Issues with TextMate set as git editor]]</li> </ul> <h3>在Windows上使用git</h3> <ul> <li>[[Using Git and GitHub for the Windows for newbies]]</li> <li><a href="http://beans.seartipy.com/2008/12/09/setting-up-ruby-on-rails-projects-with-git-and-github/">Setting up a project with Git and GitHub</a></li> <li>[[Dealing with newlines in git]]</li> </ul> <h3>跨平台的 Git</h3> <ul> <li>[[Using the EGit Eclipse Plugin with GitHub]]</li> </ul> <h3>匯入已有的專案</h3> <ul> <li>[[Import from Subversion]]</li> <li>[[Changing Your Origin]]</li> <li>[[Jump to github from your repository]]</li> </ul> <h3>Git常用功能</h3> <ul> <li>[[Git Cheat Sheet]]</li> <li>[[Remove a remote branch]]</li> <li>[[Cool and unusual Git techniques]]</li> <li>[[Changing a series of commits or patches.]]</li> <li>[[Completely remove a file from all revisions]]</li> <li>[[Change author details in commit history]]</li> <li>[[put your git branch name in your shell prompt]]</li> <li>[[Ignore for Git]]</li> </ul> <h3>遠端使用</h3> <ul> <li>[[Push a Branch to GitHub]]</li> <li>[[Push tags to github]]</li> <li>[[Dealing with errors when pushing]]</li> <li>[[Showing and tracking remote branches]]</li> <li>[[Keeping a git fork in sync with the forked repo]]</li> <li>[[Using git submodules to track plugins]]</li> <li>[[Developing with Submodules]]</li> </ul> <h2>在GitHub上面作業</h2> <ul> <li>[[Getting a copy of your github repo]]</li> <li>[[Pull Requests]]</li> <li>[[Textile Formatting]]</li> <li>[[Managing collaborators]]</li> <li>[[How do I delete a repository?]]</li> <li>[[Fork a project and submit your modifications]]</li> <li>[[Managing multiple clients and their repositories]]</li> <li>[[Multiple GitHub Accounts]]</li> <li>[[How to move a repo to another account]]</li> <li>[[Import an existing git repo]]</li> <li>[[README Formatting]]</li> <li>[[Making sense of the participation graph data]]</li> <li>[[Dealing with firewalls and proxies]]</li> <li>[[GitHub and Firefox Ubiquity]]</li> <li>[[Pages]]</li> </ul> <h2>Service Hooks</h2> <ul> <li>[[Post-Receive Hooks]]</li> <li>[[Integrating git commit messages in Lighthouse]]</li> <li>[[Lighthouse Post-Commit Hook]]</li> </ul> <h2>Deploying</h2> <ul> <li>[[Deploying with Capistrano]]</li> <li>[[Understanding deploy keys]]</li> </ul> <h2>臭蟲提報與其他要求</h2> <ul> <li>[[Disaster FAQ: What to do when GitHub goes bad]]</li> <li>[[Feature Requests]]</li> <li>[[GitHub Bugs!]]</li> <li>[[‘percent_expand: NULL replacement’ Bug]]</li> <li>[[I’m missing my Gravatar icon on my commits]]</li> <li>[[Syntax highlighting isn’t working for my language]]</li> <li>[[Why won’t my RubyGem build?]]</li> <li>[[Why aren’t my commits shown in blue in the 52 Week Participation graphs?]]</li> </ul> <h2>給開發者</h2> <ul> <li><a href="http://github.com/guides/local-github-config">Local GitHub Config</a></li> <li><a href="http://github.com/blog/170-token-authentication">Token Authentication</a></li> <li>[[The GitHub API]]</li> </ul> 2009-02-08T19:22:52-08:00 87 87 首頁

2009-02-08T19:40:36-08:00

42607

教學：在git中設定您的使用者與email位址 Git需要您的使用者與email位址以便恰當的寫入您的commits。這可以在全域設定中設定: $ git config —global user.name “mad voo” [~]$ git config —global user.email mad.vooo@gmail.com 您也可以在repo範圍中設定: $ git config user.name “mad voo” [~/path/to/repo]$ git config user.email mad.vooo@gmail.com 這些改變只會影響爾後的commits。過去的commits依然會保留他們當初commit的時候的使用者與email位址。 有些工具會假定您的github位址依然在舊有的地方 (http://github.com/blog/180-local-github-config): $ git config —global github.user madvoo [~]$ git config —global github.token 6ef8395fecf207165f1a82178ae1b984 (記得將 madvoo 與 6ef8395fecf207165f1a82178ae1b984 替換為您的使用者名稱與 token。) 2009-02-08T19:33:22-08:00 88 gitemail 教學：在git中設定您的使用者與email位址

2009-02-08T19:48:20-08:00

42607

Git has a config option called ‘core.gitproxy’ which allows you to use a command to tunnel the git:// protocol, which would normally go over TCP port 9418. So in my case, I’ve got a couple off-campus servers that I can use SSH tunnels with. I set up the typical SSH-based SOCKS proxy, thusly (you can also use apps like <a href="http://www.shimoapp.com/">Shimo</a> to manage tunnels for you): <pre class="console"><code>$ ssh -D 1080 tycho@hostname</code></pre> NOTE: If you are using ssh shared connection(controlmaster/controlpath), you will have to disable it(forwarding is not yet implemented in shared connection) <pre class="console"><code>$ ssh -S "none" -D 1080 tycho@hostname</code></pre> Then I use the tools which I’ve made available in this <a href="http://github.com/tycho/connect/tree/master">git repository</a> to make cloning with the git:// protocol tunnel through SSH run transparently. To use the tools, you need to first compile ‘connect.c’ and install the ‘connect’ binary to somewhere in your PATH (/usr/local/bin should work for this). Modify the ‘gitproxy’ script provided in the repository for your configuration (if you use the same command I used above, it should work fine without any editing). Once done editing it, install it as well. Now tell git about the gitproxy script you just installed: <pre class="console"><code>$ git config --global core.gitproxy gitproxy</code></pre> Or if you want to use it for a single repository, run the command without ‘—global’ while you’re inside the working tree of the repository. Or if you want to use it temporarily, use <pre class="console"><code>$ export GIT_PROXY_COMMAND=gitproxy</code></pre> Once this is all done, you should be able to simply do a git clone without any special URL mangling: <pre class="console"><code>$ git clone git://github.com/tycho/crisscross.git Initialized empty Git repository in /Volumes/Development/crisscross/.git/ remote: Counting objects: 1322, done. remote: Compressing objects: 100% (723/723), done. remote: Total 1322 (delta 915), reused 874 (delta 586) Receiving objects: 100% (1322/1322), 566.77 KiB | 60 KiB/s, done. Resolving deltas: 100% (915/915), done. $</code></pre> 2009-02-12T13:03:23-08:00 89 how-to-transparently-clone-from-github-with-ssh-tunnels How to transparently clone from github with ssh tunnels

2009-05-21T17:41:28-07:00

29616

There are precompiled versions available for <a href="http://code.google.com/p/msysgit/">Windows</a>, Linux (via apt-get/yum/etc) and <a href="http://code.google.com/p/git-osx-installer/">Mac OS X</a>. In addition to the precompiled versions, you can also install git via <a href="http://www.macports.org/">MacPorts</a>. However, if you want the most recent version, or to install it in a non-standard location, compiling it from source is actually very easy (on Mac OS X at least). You need to have Xcode installed, which provides a version of GCC. The most recent version can be obtained for free from the <a href="http://developer.apple.com/technology/xcode.html">Apple Developer Connection</a>. If you don’t have a fast internet connection or have some other reason not to download Xcode via Apple’s site, then you can always install Xcode from the Mac OS X DVD (from the folder labeled ‘Optional Installs’). You can download the latest stable version of git from <a href="http://git-scm.com/">git’s website</a>, in the form of a .tar.gz or .tar.bz2. The built in Mac OS X archiving utility can extract this for you, or you can extract it yourself: <pre class="console"><code>Alcarin:~ steven$ cd ~/Downloads Alcarin:Downloads steven$ tar -xjf git-1.6.1.3.tar.bz2</code></pre> And then cd to the directory: <pre class="console"><code>Alcarin:Downloads steven$ cd git-1.6.1.3</code></pre> Alternatively, if you have a version of git already installed, you can get the source from the git repository (but be warned, it’s less tested): <pre class="console"><code>Alcarin:~ steven$ git clone git://git.kernel.org/pub/scm/git/git.git Alcarin:~ steven$ cd git</code></pre> It’s recommended that when you install git, you put it in its own folder, i.e. /opt/git/ to keep things tidy. It’s also far easier to remove or install new versions (as it’s a single folder you can delete easily). Git comes with the appropriate files to allow you to use automake to generate a configure script and Makefile, but since a Makefile is already provided with git, it’s generally unnecessary and more clunky to use automake (it’s available, it’s just discouraged). If you really want to use automake, do this: <pre class="console"><code>Alcarin:git-1.6.1.3 steven$ autoreconf Alcarin:git-1.6.1.3 steven$ ./configure --prefix=/opt/git configure: CHECKS for programs checking for cc... cc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no [...] Alcarin:git-1.6.1.3 steven$ make</code></pre> Otherwise, you can simply do: <pre class="console"><code>Alcarin:git-1.6.1.3 steven$ make prefix=/opt/git</code></pre> On a Core 2 Duo 2.33GHz, building this way takes a minute and ten seconds. If you want it to build a bit faster and you have a multi-core machine, you can add the -j# flag to make (where # is a number, i.e. “make -j2”) to have it run more than one job at once. A good choice is the number of CPUs in your system plus one, but this guideline isn’t always perfect. Next, you need to install the compiled binaries: <pre class="console"><code>Alcarin:git-1.6.1.3 steven$ sudo make install prefix=/opt/git</code></pre> You should note that the git man pages are not installed at this point. They’re extremely helpful, so I recommend you install them. To do so, you first need to install ‘asciidoc’ and ‘xmlto’, which can be installed through <a href="http://www.macports.org/">MacPorts</a>. If you haven’t already done so, install MacPorts and then run this: <pre class="console"><code>Alcarin:git-1.6.1.3 steven$ sudo port install asciidoc xmlto</code></pre> This will take a while, so go have a cup of coffee or some nachos. Once those are installed, build the man pages in the git source directory: <pre class="console"><code>Alcarin:git-1.6.1.3 steven$ make man prefix=/opt/git</code></pre> And install them: <pre class="console"><code>Alcarin:git-1.6.1.3 steven$ sudo make install-man prefix=/opt/git</code></pre> Great! Now you’ve got git installed, along with its handy-dandy documentation. But before you celebrate with some beer and pizza (if it really means that much to you), you should make it easier to invoke git. With the way you currently have git installed, it’s not in your “PATH”, which means you have to type ‘/opt/git/bin/git’ every time you want to invoke git. This is far more cumbersome than necessary. The best way to fix this is to add /opt/git/bin to your PATH, so all you have to type is just ‘git’. I have a heavily customized .bash_profile file in my home directory which I use for this purpose: <pre><code>for a in local $(ls /opt/ | grep -v local | grep -v gentoo); do FULLPATH=/opt/$a if [ -x $FULLPATH ]; then if [ -x $FULLPATH/bin ]; then export PATH="$FULLPATH/bin:$PATH" fi if [ -x $FULLPATH/sbin ]; then export PATH="$FULLPATH/sbin:$PATH" fi if [ -x $FULLPATH/share/aclocal ]; then export ACLOCAL_FLAGS="-I $FULLPATH/share/aclocal $ACLOCAL_FLAGS" fi if [ -x $FULLPATH/man ]; then export MANPATH="$FULLPATH/man:$MANPATH" fi if [ -x $FULLPATH/share/man ]; then export MANPATH="$FULLPATH/share/man:$MANPATH" fi if [ -x $FULLPATH/lib/pkgconfig ]; then export PKG_CONFIG_PATH="$FULLPATH/lib/pkgconfig/:$PKG_CONFIG_PATH" fi fi done</code></pre> When you open a new Terminal window, you should just be able to type ‘git’ and it will behave as follows: <pre class="console"><code>Alcarin:~ steven$ git usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate|--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS] The most commonly used git commands are: add Add file contents to the index bisect Find the change that introduced a bug by binary search branch List, create, or delete branches checkout Checkout a branch or paths to the working tree clone Clone a repository into a new directory commit Record changes to the repository diff Show changes between commits, commit and working tree, etc fetch Download objects and refs from another repository grep Print lines matching a pattern init Create an empty git repository or reinitialize an existing one log Show commit logs merge Join two or more development histories together mv Move or rename a file, a directory, or a symlink pull Fetch from and merge with another repository or a local branch push Update remote refs along with associated objects rebase Forward-port local commits to the updated upstream head reset Reset current HEAD to the specified state rm Remove files from the working tree and from the index show Show various types of objects status Show the working tree status tag Create, list, delete or verify a tag object signed with GPG See 'git help COMMAND' for more information on a specific command. Alcarin:~ steven$</code></pre> Congratulations! You now have a working git install on Mac OS X. 2009-02-16T20:47:29-08:00 90 compiling-and-installing-git-on-mac-os-x Compiling and installing git on Mac OS X

2009-04-21T22:15:12-07:00

76392

Copy oldbranch in repo to newbranch. <code>git push {repo} {oldbranch}:heads/{newbranch}</code> Ex: <code>git push origin foobranch:barbranch</code> renames foobranch to barbranch 2009-06-18T23:44:44-07:00 97 copy-a-remote-branch Copy a remote branch

2009-06-18T23:45:03-07:00

25494

git does not support it directly, but you can [[Copy a remote branch]] and [[Remove a remote branch]]. <tt><a href="http://github.com/webmat/git_remote_branch/tree/master">git_remote_branch</a></tt> 2009-06-18T23:52:29-07:00 98 rename-a-remote-branch Rename a remote branch

2009-06-18T23:52:29-07:00

25494

<h1>Close issues from a commit message</h1> During commit you can close any active issues in your issue tracker like so: <pre class="console"><code>$ git commit -m "fixed the damn IE6 bug. closes #41"</code></pre> It will also create a comment on the issue with the message and add a link to the commit’s SHA. <h1>Keyboard shortcuts</h1> Press ? to bring up the shortcut menu. They are currently: <tt> c Create issue l Create label i Back to inbox u Back to issues I Mark selected as read U Mark selected as unread e Close selected y Remove selected from view j Move target down k Move target up o Show target x Toggle select target ? Show hotkey help / Focus issues search enter Show target </tt> <h1>Other features</h1> <ul> <li>Create and apply labels to issues to assign to users or categorize</li> <li>Drag and drop issues to prioritize them</li> <li>Vote on issues that you want to see tackled</li> <li>Search, sort, and filter</li> <li>Keyboard shortcuts</li> </ul> <h2>Short video introduction to GitHub Issues</h2> <embed style="border: 1px solid #666;" src="http://blip.tv/play/AfqxMgA" type="application/x-shockwave-flash" width="540" height="367" allowscriptaccess="always" allowfullscreen="true"></embed> 2009-09-24T18:34:22-07:00 102 working-with-the-issue-tracker Working with the Issue Tracker

2009-09-24T19:00:38-07:00

39191