Joined May 2011
·
nullobject

Josh Bassett

Ferocia
·
Melbourne, Australia
·
·
·

Posted to Get a list of files with conflicts over 1 year ago

I have this in my .gitconfig, it does the same thing I believe:

[alias]
  conflicts = diff --name-only --diff-filter=U
Achievements
130 Karma
0 Total ProTip Views
Philanthropist
Truly improve developer quality of life by sharing at least 50 individual open source projects
Bear 3
Have at least three original repos where Objective-C is the dominant language
Bear
Have at least one original repo where Objective-C is the dominant language
Platypus
Have at least one original repo where scala is the dominant language
Ashcat
Make Ruby on Rails better for everyone by getting a commit accepted
Altruist
Increase developer well-being by sharing at least 20 open source projects
Lemmings 100
Write something great enough to have at least 100 watchers of the project
Kona
Have at least one original repo where CoffeeScript is the dominant language
Walrus
The walrus is no stranger to variety. Use at least 4 different languages throughout all your repos
Forked
Have a project valued enough to be forked by someone else
Charity
Fork and commit to someone's open source project in need
Mongoose 3
Have at least three original repos where Ruby is the dominant language
Mongoose
Have at least one original repo where Ruby is the dominant language
Interests & Skills
JavaScript
Ruby
Haskell
CoffeeScript
ActionScript
API Design
Open Source
Shell
C++
C
Erlang
Arduino
VHDL
Scala
Objective-C
CSS
Ruby on Rails