diff options
Diffstat (limited to 'Sparkles/Git/Git.Repository.cs')
| -rw-r--r-- | Sparkles/Git/Git.Repository.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Sparkles/Git/Git.Repository.cs b/Sparkles/Git/Git.Repository.cs index 2588d82..b7136fc 100644 --- a/Sparkles/Git/Git.Repository.cs +++ b/Sparkles/Git/Git.Repository.cs @@ -434,7 +434,7 @@ namespace Sparkles.Git { git = new GitCommand (LocalPath, "config core.ignorecase true"); git.StartAndWaitForExit (); - git = new GitCommand (LocalPath, "merge FETCH_HEAD"); + git = new GitCommand (LocalPath, "merge --no-edit FETCH_HEAD"); git.StartInfo.RedirectStandardOutput = false; string error_output = git.StartAndReadStandardError (); |