-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
David Padilla
committed
Aug 31, 2010
1 parent
373ce7e
commit 5f619e8
Showing
16 changed files
with
315 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
180 changes: 180 additions & 0 deletions
180
_site/2010/08/31/open-and-watch-specific-git-branches-using-gitx.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" | ||
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | ||
| <head> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> | ||
| <title>Crowd Interactive Tech Blog :: Open and watch specific git branches using gitx</title> | ||
| <link rel="stylesheet" href="/stylesheets/screen.css" type="text/css" media="screen, projection" /> | ||
| <link rel="stylesheet" href="/stylesheets/print.css" type="text/css" media="print" /> | ||
| <link rel="stylesheet" href="/stylesheets/styles.css" type="text/css" media="screen" /> | ||
| <link rel="stylesheet" href="/stylesheets/syntax.css" type="text/css" media="screen" /> | ||
| <link rel="alternate" type="application/rss+xml" title="RSS Feed for blog.crowdint.com" href="http://feeds.feedburner.com/CrowdInteractiveTechBlog" /> | ||
| <!--[if lt IE 8]><link rel="stylesheet" href="css/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]--> | ||
|
|
||
| <script type="text/javascript"> | ||
|
|
||
| var _gaq = _gaq || []; | ||
| _gaq.push(['_setAccount', 'UA-17527068-1']); | ||
| _gaq.push(['_trackPageview']); | ||
|
|
||
| (function() { | ||
| var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; | ||
| ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; | ||
| var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); | ||
| })(); | ||
|
|
||
| </script> | ||
|
|
||
| </head> | ||
| <body> | ||
| <div class="container"> | ||
| <div id="empty-header"> | ||
| <a href="/"><img src="/images/logo_03.png" id="logoHead" width="227" height="74" alt="LogoHead" /></a> | ||
| </div> | ||
| <div class="span-24 append-bottom testGlow"> | ||
| <div class="round-top span-24"> | ||
| | ||
| </div> | ||
| <div id="white-body" class="span-24"> | ||
| <div class="left-side span-17"> | ||
| <div class="post prepend-1"> | ||
| <h1>Open and watch specific git branches using gitx</h1> | ||
| <p class="author"> | ||
| <span class="date"><b>Aug 31</b><br />2010</span> | ||
| </p> | ||
| <div class="body prepend-1 append-1"> | ||
| <div class="gravatar span-3"><img src="http://www.gravatar.com/avatar/d32b52ec6403614b1adf3e648cbbe584" class="avatar" alt="Avatar" /></div> | ||
| <p>It happens, the project and the team grows, and now, there's a bunch of branches in your git repo. It's called <em>branchitis</em>, and it happens to everyone at some point.</p> | ||
|
|
||
| <p>If you're lucky enough to be working on a Mac, odds are that you're using <a href="http://gitx.frim.nl/">gitx</a> to watch over your git repos. You're not?! Shame on you.</p> | ||
|
|
||
| <p>Anyway, so, you open gitx, and all you see is a bowl of spaghetti</p> | ||
|
|
||
| <p><img src="/images/2010/08/31/a.jpg" alt="Bowl of Spaghetti" /></p> | ||
|
|
||
| <p>So, if you want to see a specific branch, you can call gitx from the command line and specify the branch you want to see</p> | ||
|
|
||
| <div class="highlight"><pre><code class="bash"><span class="nv">$ </span>gitx feature2 | ||
| </code></pre> | ||
| </div> | ||
|
|
||
|
|
||
| <p><img src="/images/2010/08/31/b.jpg" alt="One branch" /></p> | ||
|
|
||
| <p>Nothing out of this world here, since you can do the same thing by using the built in dropdown on gitx to select the branch you want to see, but, did you know that you can specify more than one branch?</p> | ||
|
|
||
| <p>So, let's say you want to merge the <em>feature2</em> and the <em>feature5</em> branch, but first, you want to see how the branches are related. You can call gitx from the command line and specify <em>both</em> branches as the arguments.</p> | ||
|
|
||
| <div class="highlight"><pre><code class="bash"><span class="nv">$ </span>gitx feature2 feature5 | ||
| </code></pre> | ||
| </div> | ||
|
|
||
|
|
||
| <p>Then you'd get something like this:</p> | ||
|
|
||
| <p><img src="/images/2010/08/31/c.jpg" alt="Two branches" /></p> | ||
|
|
||
| <p>Cool! You can actually read this first hand, and it's faster than trying to descipher the spaguhetti.</p> | ||
|
|
||
| <p>In case you're wondering, yes, you can specify 3 branches, or as many as you'd like to see. Go ahead, try it out.</p> | ||
|
|
||
| <p>Hope this helps you in some way,</p> | ||
|
|
||
| <p>Cheers.</p> | ||
|
|
||
| <div class="author_box"> | ||
| <p><b>Author:</b> David Padilla | david@crowdint.com</p> | ||
| </div> | ||
| <div class="tweet"> | ||
| <a href="http://twitter.com/share" class="twitter-share-button" data-count="none">Tweet</a> | ||
| <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> | ||
| </div> | ||
| <div id="disqus_thread"></div> | ||
| <script type="text/javascript"> | ||
| /** | ||
| * var disqus_identifier; [Optional but recommended: Define a unique identifier (e.g. post id or slug) for this thread] | ||
| */ | ||
| // var disqus_developer = 1; | ||
| (function() { | ||
| var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; | ||
| dsq.src = 'http://crowdinttech.disqus.com/embed.js'; | ||
| (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); | ||
| })(); | ||
| </script> | ||
| <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript=crowdinttech">comments powered by Disqus.</a></noscript> | ||
| <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a> | ||
| </div> | ||
| <div class="nav_links span-16"> | ||
|
|
||
| <div class="previous span-8"><a href="/2010/08/26/thin-vs-unicorn.html"><< Benchmarking thin vs unicorn</a></div> | ||
|
|
||
|
|
||
| </div> | ||
| </div> | ||
| <div class="post prepend-1"> | ||
| <h1>Related Posts</h1> | ||
| <ul class="archives"> | ||
|
|
||
| <li><span><b>11 Jul 2010</b></span> » <a href="/2010/07/11/git-initial-configuration.html">First Things First... Our initial git configuration</a></li> | ||
|
|
||
| <li><span><b>06 Aug 2010</b></span> » <a href="/2010/08/06/our-git-workflow.html">Our git workflow</a></li> | ||
|
|
||
| <li><span><b>28 Jul 2010</b></span> » <a href="/2010/07/28/getting-started-with-rvm.html">Getting started with Ruby Version Manager (RVM)</a></li> | ||
|
|
||
| <li><span><b>17 Aug 2010</b></span> » <a href="/2010/08/17/use-a-project-specific-ruby-version-rvm.html">Use a project specific Ruby version with RVM</a></li> | ||
|
|
||
| <li><span><b>18 Jul 2010</b></span> » <a href="/2010/07/18/setting-up-automation-with-cucumber-rspec-autotest.html">Setting up Automation with Cucumber, RSpec, Autotest in RoR 2.3.8</a></li> | ||
|
|
||
| </ul> | ||
| </div> | ||
| </div> | ||
| <div class="right-side span-5 last prepend-1"> | ||
| <h1><a href="/">Blog Home</a></h1> | ||
| <h1>About Crowd Interactive</h1> | ||
| <p class="append-1 about">Crowd Interactive is an American web design and development company that happens to work in Colima, Mexico... <a href="/about.html">Read More...</a></p> | ||
| <h1>Our Favorite Sites</h1> | ||
| <ul> | ||
| <li><a href="http://www.crowdint.com">Crowd Interactive</a></li> | ||
| <li><a href="http://rubyonrails.org">Ruby on Rails</a></li> | ||
| <li><a href="http://ruby-lang.org">Ruby-Lang</a></li> | ||
| <li><a href="http://github.com/crowdint">Github</a></li> | ||
| </ul> | ||
| <h1>Stuff we've built</h1> | ||
| <ul> | ||
| <li><a href="http://www.modcloth.com">ModCloth</a></li> | ||
| <li><a href="http://www.creativeallies.com">Creative Allies</a></li> | ||
| <li><a href="http://www.nameframe.com">Nameframe</a></li> | ||
| <li><a href="http://github.com/crowdint/rails3-jquery-autocomplete">Rails3-jQuery-Autocomplete</a></li> | ||
| <li><a href="http://github.com/crowdint/rankstar">rankstar</a></li> | ||
| <li><a href="http://github.com/crowdint/blog.crowdint.com">This site's source code</a></li> | ||
| </ul> | ||
| <h1>Older Posts</h1> | ||
| <ul> | ||
| <li><a href="/archive.html">Archive</a></li> | ||
| </ul> | ||
|
|
||
| Site Powered by <a href="http://github.com/mojombo/jekyll">Jekyll</a> | ||
|
|
||
| </div> | ||
| </div> | ||
| <div class="round-bottom span-24"> | ||
| | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| <div id="footer"> | ||
| <div class="copyContent" > | ||
| <p class="copy">Copyright © 2010, Crowd Interactive. All rights reserved.</p> | ||
| </div> | ||
| </div> | ||
| <script type="text/javascript"> | ||
| var disqus_shortname = 'crowdinttech'; | ||
| (function () { | ||
| var s = document.createElement('script'); s.async = true; | ||
| s.src = 'http://disqus.com/forums/crowdinttech/count.js'; | ||
| (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s); | ||
| }()); | ||
| </script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.