beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1604 from markusstoll/logfix

Browse source 
fix "Recent Changes" view for merged changes
This commit is contained in:
Hylke Bons 2015-01-13 21:42:01 +00:00
parent bafeef2fd4 d34ed08052
commit 2679235bb7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -786,7 +786,7 @@ namespace SparkleLib.Git {
if (path == null) {
git = new SparkleGit (LocalPath, "log --since=1.month --raw --find-renames --date=iso " +
"--format=medium --no-color -m --first-parent");
"--format=medium --no-color --no-merges");
} else {
path = path.Replace ("\\", "/");
@ -799,7 +799,7 @@ namespace SparkleLib.Git {
if (path == null && string.IsNullOrWhiteSpace (output)) {
git = new SparkleGit (LocalPath, "log -n 75 --raw --find-renames --date=iso " +
"--format=medium --no-color -m --first-parent");
"--format=medium --no-color --no-merges");
output = git.StartAndReadStandardOutput ();
}