Skip to content

Instantly share code, notes, and snippets.

@morganchristiansson

morganchristiansson/.gitconfig

Forked from foca/.gitconfig
Created February 15, 2011 10:34
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save morganchristiansson/827375 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save morganchristiansson/827375 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. morganchristiansson revised this gist Feb 15, 2011. 3 changed files with 2 additions and 2 deletions.
    0 ~/.gitconfig → .gitconfig
    View file
    File renamed without changes.
    2 changes: 2 additions & 0 deletions git-unmerged-files
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,2 @@
    #!/usr/bin/env ruby
    puts `git status`.split("\n").select {|f| f =~ /(?:unmerged|both modified)/ }.map {|f| f.gsub(/#\s+(?:unmerged|both modified):\s*/, "") }.join(" ")
    2 changes: 0 additions & 2 deletions ~/bin/git-unmerged-files
    View file
    Original file line number Diff line number Diff line change
    @@ -1,2 +0,0 @@
    #!/usr/bin/env ruby
    puts `git status`.split("\n").select {|f| f =~ /unmerged/ }.map {|f| f.gsub(/#\s+unmerged:\s*/, "") }.join(" ")
  2. @foca foca created this gist Oct 10, 2009.
    2 changes: 2 additions & 0 deletions ~/.gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,2 @@
    [alias]
    unmerged = !vim -o $(git-unmerged-files)
    2 changes: 2 additions & 0 deletions ~/bin/git-unmerged-files
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,2 @@
    #!/usr/bin/env ruby
    puts `git status`.split("\n").select {|f| f =~ /unmerged/ }.map {|f| f.gsub(/#\s+unmerged:\s*/, "") }.join(" ")