Permalink
Browse files

Merge branch 'maint' into 'master'

  • Loading branch information...
2 parents c5a6cdc + d10ab11 commit 47b4632f328b62591525ca95f3cfe711e04543af @vanicat vanicat committed Sep 26, 2012
Showing with 11 additions and 7 deletions.
  1. +2 −2 CONTRIBUTING.md
  2. +7 −3 magit.el
  3. +2 −2 magit.texi
View
4 CONTRIBUTING.md
@@ -12,7 +12,7 @@ Magit uses 3 main branches for its lifecyle: `maint`, `master` and `next`.
* `master` contains the set of patches that will highly likely make it into the
next major release.
* `next` contains patches that necessitate some additional checks/improvements
- before they're integrating into a release.
+ before they're integrated into a release.
## Making changes
@@ -27,7 +27,7 @@ Please make sure your commits are well-organized and "atomic" (hitting a single
well-defined target each).
Please also make sure you check that byte-compilation completes without errors
-of warnings, and that tests run without failures.
+or warnings, and that tests run without failures.
Bonus points if you add tests to cover the feature you're hacking.
View
10 magit.el
@@ -830,9 +830,12 @@ Does not follow symlinks."
prompt)
choices predicate require-match initial-input hist def))
-(defun magit-completing-read (prompt choices &optional predicate require-match
+(defun magit-completing-read (prompt collection &optional predicate require-match
initial-input hist def)
- (funcall magit-completing-read-function prompt choices predicate require-match
+ "Call function in `magit-completing-read-function' to read user input
+
+Read `completing-read' documentation for the meaning of the argument"
+ (funcall magit-completing-read-function prompt collection predicate require-match
initial-input hist def))
(defun magit-use-region-p ()
@@ -3634,14 +3637,15 @@ user input."
4))
(or (magit-get-top-dir default-directory)
(magit-read-top-dir nil)))))
- (magit-save-some-buffers)
(let ((topdir (magit-get-top-dir dir)))
(unless topdir
(when (y-or-n-p (format "There is no Git repository in %S. Create one? "
dir))
(magit-init dir)
(setq topdir (magit-get-top-dir dir))))
(when topdir
+ (let ((default-directory topdir))
+ (magit-save-some-buffers))
(let ((buf (or (magit-find-status-buffer topdir)
(generate-new-buffer
(concat "*magit: "
View
4 magit.texi
@@ -11,7 +11,7 @@
@end direntry
@copying
-Copyright @copyright{} 2008, 2009, 2010, 2011 Magit contributors. (See
+Copyright @copyright{} 2008, 2009, 2010, 2011, 2012 Magit contributors. (See
the header of magit.el for the lengthy list of Magit contributors.)
@quotation
@@ -569,7 +569,7 @@ Typing @kbd{b m} will let you rename a branch. Unless a branch with the same
name already exists, obviously...
-To create a new branch and switch to it immediately, type @kbd{b n}.
+To create a new branch and switch to it immediately, type @kbd{b c}.
To delete a branch, type @kbd{b d}. If you're currently on that

0 comments on commit 47b4632

Please sign in to comment.