Merge branch 'diff-panel-output'

Conflicts: git.py
kemayo · Jan 23, 2012 · 510e09f · 510e09f
2 parents 31bfa38 + 260465c
commit 510e09f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Git.sublime-settings b/Git.sublime-settings
@@ -5,4 +5,7 @@
 	// if present, use this command instead of plain "git"
 	// e.g. "/Users/kemayo/bin/git" or "C:\bin\git.exe"
 	,"git_command": false
+
+  // use the panel for diff output, rather than a new scratch window (new tab)
+  ,"diff_panel": false
 }
diff --git a/git.py b/git.py
@@ -365,7 +365,11 @@ def diff_done(self, result):
         if not result.strip():
             self.panel("No output")
             return
-        view = self.scratch(result, title="Git Diff")
+        s = sublime.load_settings("Git.sublime-settings")
+        if s.get('diff_panel'):
+            view = self.panel(result)
+        else:
+            view = self.scratch(result, title="Git Diff")
         lines_inserted = view.find_all(r'^\+[^+]{2} ')
         lines_deleted = view.find_all(r'^-[^-]{2} ')