Skip to content

Instantly share code, notes, and snippets.

View mgalgs's full-sized avatar
🍔
pizza

Mitchel Humpherys mgalgs

🍔
pizza
View GitHub Profile
diff --git a/magit.el b/magit.el
index 4b3c1fa..c03146c 100644
--- a/magit.el
+++ b/magit.el
@@ -1076,12 +1076,14 @@ Read `completing-read' documentation for the meaning of the argument."
(insert (magit-cmd-output cmd args)))
(defun magit-cmd-output (cmd args)
+ (message "no problem here")
(with-output-to-string
;; This buffer is for notes you don't want to save, and for Lisp evaluation.
;; If you want to create a file, visit that file with C-x C-f,
;; then enter the text in that file's own buffer.
;; This buffer is for notes you don't want to save, and for Lisp evaluation.
;; If you want to create a file, visit that file with C-x C-f,
;; then enter the text in that file's own buffer.
;; This buffer is for notes you don't want to save, and for Lisp evaluation.
;; If you want to create a file, visit that file with C-x C-f,
;; then enter the text in that file's own buffer.
all:
javac -version
@mgalgs
mgalgs / gist:6394024
Created August 30, 2013 20:36
ipython and optparse
In [1]: from optparse import OptionParser
In [2]: parser = OptionParser()
In [3]: parser.add_option("", "--cpu-state")
Out[3]: <Option at 0x1556fc8: --cpu-state>
In [4]: args = ["--stuff", "--cpu-state"]
In [5]: options, args = parser.parse_args(args)
lazy-search-menu: Wrong number of arguments: (lambda (title info-alist &optional miss-match-exit-p recursion-p protect-function alternate-function execute-last-command-when-miss-match) "One key menu.
`TITLE' is the title of menu, can use any string.
`INFO-ALIST' is a special alist
that contains KEY, DESCRIBE and COMMAND.
`MISS-MATCH-EXIT-P' whether to hide popup help window
when keystroke can't match in menu.
`RECURSION-P' whether recursion execute self
when keystroke can't match in menu.
`PROTECT-FUNCTION' the protect function
diff --git a/magit.el b/magit.el
index 209418a..bbcabbc 100644
--- a/magit.el
+++ b/magit.el
@@ -5237,7 +5237,7 @@ Return nil if there is no rebase in progress."
(cons (concat "refs/heads/" branch)
magit-uninteresting-refs)
magit-uninteresting-refs))))
- (magit-run-git "rebase" (magit-rev-to-git rev)))))
+ (magit-run-git "rebase" "--autosquash" "--autostash" (magit-rev-to-git rev)))))
diff --git a/magit.el b/magit.el
index 209418a..bbcabbc 100644
--- a/magit.el
+++ b/magit.el
@@ -5237,7 +5237,7 @@ Return nil if there is no rebase in progress."
(cons (concat "refs/heads/" branch)
magit-uninteresting-refs)
magit-uninteresting-refs))))
- (magit-run-git "rebase" (magit-rev-to-git rev)))))
+ (magit-run-git "rebase" "--autosquash" "--autostash" (magit-rev-to-git rev)))))
diff --git a/magit.el b/magit.el
index 209418a..bbcabbc 100644
--- a/magit.el
+++ b/magit.el
@@ -5237,7 +5237,7 @@ Return nil if there is no rebase in progress."
(cons (concat "refs/heads/" branch)
magit-uninteresting-refs)
magit-uninteresting-refs))))
- (magit-run-git "rebase" (magit-rev-to-git rev)))))
+ (magit-run-git "rebase" "--autosquash" "--autostash" (magit-rev-to-git rev)))))