release version 2.6.02.6.0

6 files changed, 70 insertions, 51 deletions

diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt
index 36e2b3e..1ffd3c3 100644
--- a/Documentation/RelNotes/2.6.0.txt
+++ b/Documentation/RelNotes/2.6.0.txt
@@ -11,8 +11,15 @@ Magit and Git itself deserve to be called porcelains.
 
 For more information about Magit, see http://magit.vc.
 
-Magit v2.6.0 Release Notes (draft)
-==================================
+Magit v2.6.0 Release Notes
+==========================
+
+Released 29 March 2016 by Jonas Bernoulli.
+
+We are pleased to announce the release of Magit version 2.6.0,
+representing 77 commits by 7 contributors over 2 months.
+
+Also see http://emacsair.me/2016/03/29/magit-2.6.
 
 Updates since v2.5.0
 --------------------
@@ -20,23 +27,27 @@ Updates since v2.5.0
 * Added a cache, which memorizes the values of some function calls for
   the duration of a refresh.  This cuts the calls to git in half.
 
+* Added new option `magit-diff-hide-trailing-cr-characters'.  When its
+  value is non-nil (the default on Windows), then ^M characters at the
+  end of diff lines are hidden.
+
 * Added new command `magit-diff-buffer-file-popup' intended for use in
   file-visiting buffers.  It shows the same popup as `magit-diff-popup'
   but starts out already limited to the visited file.
 
+* Added new command `magit-ediff-show-stash', which is available in
+  the Ediff popup and will be used when `magit-ediff-dwim' is called
+  with point on a stash.
+
+* Added new command `magit-reset-popup' featuring all the available
+  reset variants.
+
 * Added new command `magit-push-refspecs', which allows pushing using
   one or more comma-separated and refspecs, which are explicitly typed
   in the minibuffer.
 
 * Added new commands `magit-fetch-refspec' and `magit-fetch-branch'.
 
-* Added new command `magit-reset-popup' featuring all the available
-  reset variants.
-
-* Added new command `magit-ediff-show-stash', which is available in
-  the Ediff popup and will be used when `magit-ediff-dwim' is called
-  with point on a stash.
-
 * Added new section inserters
   `magit-insert-modules-unpulled-from-pushremote' and
   `magit-insert-modules-unpushed-to-pushremote', and renamed
@@ -45,15 +56,15 @@ Updates since v2.5.0
   `magit-insert-unpushed-module-commits' to
   `magit-insert-modules-unpushed-to-upstream'.
 
+* The command `magit-submodule-add' now allows using a module name
+  different from the path of the module.
+
 * If `magit-push-current-set-remote-if-missing's value is `default',
   then the command `magit-push-current-to-pushremote' now offers to
   set `remote.pushDefault' unless the push-remote is already set in
   some way.  Previously this command offered to set the local value
   `branch.NAME.pushRemote' for all non-nil values of the option.
 
-* Command `magit-submodule-add' now allows using a module name
-  different from the path of the module.
-
 * When washing the diff that is to be displayed while writing a
   commit message takes too long, then it is now possible to abort that
   by pressing `C-g'.  Previously that would have aborted the commit.
@@ -67,10 +78,6 @@ Updates since v2.5.0
   form `(eval FORM)' instead of a symbol.  An atomic TYPE is never
   evaluated, but FORM is evaluated at run-time.
 
-* Added new option `magit-diff-hide-trailing-cr-characters'.  When it
-  is non-nil (the default on Windows), then ^M characters at the end
-  of diff lines are hidden.
-
 Fixes since v2.5.0
 ------------------
 
@@ -84,46 +91,57 @@ Fixes since v2.5.0
 
 * If the user sets the variable `magit-auto-revert-mode' or the
   obsolete alias `magit-revert-buffers' to nil anytime during startup,
-  before or after `magit-autorevert' is loaded, then the mode is not
-  turned on (actually it is explicitly turned off).
+  before or after `magit-autorevert' is loaded, then the mode is now
+  no longer turned on (actually it is explicitly turned off).
 
-* `magit-insert-unpulled-from-pushremote' and
-  `magit-insert-unpushed-to-pushremote' missed an edge case when
-  checking whether their section should be inserted into the status
-  buffer.
+* When a revision buffer was limited to a set of files, its header
+  line did not say so.
 
-* `magit-clone' did not switch to the cloned repository before trying
-  to delete the symbolic-ref "origin/HEAD".
+* The function `magit-run-git-with-input' had stopped calling
+  `magit-pre-call-git-hook' and logging its git command to the
+  magit-process buffer.
 
-* `magit-diff-wash-submodule did not handle some less common cases.
+* The function `magit-diff-wash-submodule did not handle some less
+  common cases.
 
-* `magit-merge-preview' did not recognize sections for added or
-  deleted files.
+* The command `magit-section-cycle-diffs' hung when hiding sections.
 
-* `magit-run-git-with-input' had stopped calling
-  `magit-pre-call-git-hook' and logging its git command to the
-  magit-process buffer.
+* Invoking `magit-commit-popup's default action by invoking the popup
+  command with a prefix argument failed due to a typo.
 
-* When a revision buffer was limited to a set of files, its header
-  line did not say so.
+* The command `magit-toggle-buffer-lock' failed if another buffer is
+  already locked to the same value.
 
-* On `windows-nt' systems, having `mount' in `exec-path' caused Magit
-  to assume that git is from Cygwin.
+* The command `magit-clone' did not switch to the cloned repository
+  before trying to delete the symbolic-ref "origin/HEAD".
 
-* Invoking `magit-commit-popup's default action failed due to a typo.
+* The commands `magit-insert-unpulled-from-pushremote' and
+  `magit-insert-unpushed-to-pushremote' missed an edge case when
+  checking whether their section should be inserted into the status
+  buffer.
 
-* `magit-section-cycle-diffs' hung when hiding sections.
+* The command `magit-merge-preview' did not recognize sections for
+  added or deleted files.
 
-* `magit-show-stash' did not properly handle untracked files that were
-  within subdirectories.
+* The command `magit-show-stash' did not properly handle untracked
+  files that were within subdirectories.
 
-* `magit-toggle-buffer-lock' failed if another buffer is already
-  locked to the same value.
+* On `windows-nt' systems, having `mount' in `exec-path' caused Magit
+  to assume that git is from Cygwin.
 
 * Added a kludge to work around a bug in Apple's OS X which causes
   `file-accessible-directory-p' to return incorrect results.
 
-This release also contains documentation updates.
+This release also contains typofixes, documentation updates, and code
+clean-ups.
 
 Authors
 -------
+
+    53  Jonas Bernoulli
+    13  Kyle Meyer
+     4  Luís Oliveira
+     4  Noam Postavsky
+     1  Dan Erikson
+     1  Dato Simó
+     1  Russell Black
diff --git a/Makefile b/Makefile
index 79d7d76..afa85df 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ help:
 	$(info make genstats         - regenerate statistics)
 	$(info make authors          - regenerate AUTHORS.md)
 	$(info make dist             - create tarballs)
-	$(info make VERSION=N.M bump-versions - bump versions for release)
+	$(info make bump-versions    - bump versions for release)
 	$(info make bump-snapshots   - bump versions after release)
 	@printf "\n"
 
@@ -154,7 +154,7 @@ endef
 export set_package_requires
 
 define set_manual_version
-(let ((version (split-string "$(VERSION)" "\\.")))
+(let ((version (split-string "$(MAGIT_VERSION)" "\\.")))
   (setq version (concat (car version) "." (cadr version)))
   (dolist (file (list "magit-popup" "magit"))
     (with-current-buffer (find-file-noselect (format "Documentation/%s.org" file))
diff --git a/default.mk b/default.mk
index fd8bb1e..9593230 100644
--- a/default.mk
+++ b/default.mk
@@ -54,17 +54,18 @@ ELGS = magit-autoloads.el magit-version.el
 
 EMACS_VERSION = 24.4
 
+MAGIT_VERSION       = 2.6
 ASYNC_VERSION       = 1.5
 DASH_VERSION        = 2.12.1
 WITH_EDITOR_VERSION = 2.5.0
-GIT_COMMIT_VERSION  = 2.4.1
-MAGIT_POPUP_VERSION = 2.4.1
+GIT_COMMIT_VERSION  = 2.5.0
+MAGIT_POPUP_VERSION = 2.5.0
 
 ASYNC_MELPA_SNAPSHOT       = 20150909.2257
 DASH_MELPA_SNAPSHOT        = 20151021.113
-WITH_EDITOR_MELPA_SNAPSHOT = 20160128.1201
-GIT_COMMIT_MELPA_SNAPSHOT  = 20160119.1409
-MAGIT_POPUP_MELPA_SNAPSHOT = 20160119.1409
+WITH_EDITOR_MELPA_SNAPSHOT = 20160223.115
+GIT_COMMIT_MELPA_SNAPSHOT  = 20160130.64
+MAGIT_POPUP_MELPA_SNAPSHOT = 20160302.322
 
 EMACSBIN ?= emacs
 
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 0eee778..b37abe0 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -11,7 +11,7 @@
 ;;	Marius Vollmer <marius.vollmer@gmail.com>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (dash "20151021.113") (with-editor "20160128.1201"))
+;; Package-Requires: ((emacs "24.4") (dash "2.12.1") (with-editor "2.5.0"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
index 6119f7c..1a7f587 100644
--- a/lisp/magit-popup.el
+++ b/lisp/magit-popup.el
@@ -12,7 +12,7 @@
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1"))
 ;; Keywords: bindings
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit.el b/lisp/magit.el
index b84ff16..0f7def8 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -16,7 +16,7 @@
 ;;	Rémi Vanicat      <vanicat@debian.org>
 ;;	Yann Hodique      <yann.hodique@gmail.com>
 
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113") (with-editor "20160128.1201") (git-commit "20160119.1409") (magit-popup "20160119.1409"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1") (with-editor "2.5.0") (git-commit "2.5.0") (magit-popup "2.5.0"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit