dolphin-emu tob$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: Source/Core/VideoCommon/Src/EmuWindow.cpp
# modified: Source/Core/VideoCommon/Src/RenderBase.cpp
# modified: Source/Core/VideoCommon/Src/VertexManagerBase.cpp
# modified: Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
# both modified: Source/Core/VideoCommon/Src/VideoConfig.cpp
# both modified: Source/Core/VideoCommon/Src/VideoConfig.h
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: Source/Core/VideoCommon/Src/EmuWindow.cpp
# modified: Source/Core/VideoCommon/Src/RenderBase.cpp
# modified: Source/Core/VideoCommon/Src/VertexManagerBase.cpp
# modified: Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
# both modified: Source/Core/VideoCommon/Src/VideoConfig.cpp
# both modified: Source/Core/VideoCommon/Src/VideoConfig.h
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
Desktop HTPC:
Gigabyte Z97X-Gaming5- i7-4790k MSI-B75-E33, i5-2500k
Corsair Vengeance 16GB RAM Crucial 8GB RAM
Gigabyte GTX780 GHz Edt. ASUS GTX960 Strix
Win 10 Pro / OS X 10.10 Win 10 Pro
Gigabyte Z97X-Gaming5- i7-4790k MSI-B75-E33, i5-2500k
Corsair Vengeance 16GB RAM Crucial 8GB RAM
Gigabyte GTX780 GHz Edt. ASUS GTX960 Strix
Win 10 Pro / OS X 10.10 Win 10 Pro
