From 6aa19140aa53592f3293ec909ff274cdbeab84a8 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sat, 20 Feb 2016 14:03:17 +0100 Subject: [PATCH] update magit. --- .../AUTHORS.md | 0 .../COPYING | 0 .../dir | 0 .../git-rebase.el | 0 .../magit-apply.el | 0 .../magit-autoloads.el | 52 ++++----- .../magit-autorevert.el | 0 .../magit-bisect.el | 0 .../magit-blame.el | 0 .../magit-commit.el | 10 +- .../magit-core.el | 0 .../magit-diff.el | 27 +++-- .../magit-ediff.el | 0 .../magit-extras.el | 0 .../magit-git.el | 2 +- .../magit-log.el | 7 +- .../magit-mode.el | 0 .../magit-pkg.el | 2 +- .../magit-process.el | 18 ++- .../magit-remote.el | 0 .../magit-section.el | 0 .../magit-sequence.el | 0 .../magit-stash.el | 0 .../magit-submodule.el | 0 .../magit-utils.el | 0 .../magit-wip.el | 0 .../magit.el | 5 +- .../magit.info | 106 +++++++++--------- .../magit.info-1 | 2 +- .../magit.info-2 | Bin 30 files changed, 128 insertions(+), 103 deletions(-) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/AUTHORS.md (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/COPYING (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/dir (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/git-rebase.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-apply.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-autoloads.el (97%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-autorevert.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-bisect.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-blame.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-commit.el (98%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-core.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-diff.el (98%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-ediff.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-extras.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-git.el (99%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-log.el (99%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-mode.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-pkg.el (82%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-process.el (98%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-remote.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-section.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-sequence.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-stash.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-submodule.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-utils.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit-wip.el (100%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit.el (99%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit.info (65%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit.info-1 (99%) rename elpa/{magit-20160211.2105 => magit-20160218.2137}/magit.info-2 (100%) diff --git a/elpa/magit-20160211.2105/AUTHORS.md b/elpa/magit-20160218.2137/AUTHORS.md similarity index 100% rename from elpa/magit-20160211.2105/AUTHORS.md rename to elpa/magit-20160218.2137/AUTHORS.md diff --git a/elpa/magit-20160211.2105/COPYING b/elpa/magit-20160218.2137/COPYING similarity index 100% rename from elpa/magit-20160211.2105/COPYING rename to elpa/magit-20160218.2137/COPYING diff --git a/elpa/magit-20160211.2105/dir b/elpa/magit-20160218.2137/dir similarity index 100% rename from elpa/magit-20160211.2105/dir rename to elpa/magit-20160218.2137/dir diff --git a/elpa/magit-20160211.2105/git-rebase.el b/elpa/magit-20160218.2137/git-rebase.el similarity index 100% rename from elpa/magit-20160211.2105/git-rebase.el rename to elpa/magit-20160218.2137/git-rebase.el diff --git a/elpa/magit-20160211.2105/magit-apply.el b/elpa/magit-20160218.2137/magit-apply.el similarity index 100% rename from elpa/magit-20160211.2105/magit-apply.el rename to elpa/magit-20160218.2137/magit-apply.el diff --git a/elpa/magit-20160211.2105/magit-autoloads.el b/elpa/magit-20160218.2137/magit-autoloads.el similarity index 97% rename from elpa/magit-20160211.2105/magit-autoloads.el rename to elpa/magit-20160218.2137/magit-autoloads.el index 81762d12..ae28cd84 100644 --- a/elpa/magit-20160211.2105/magit-autoloads.el +++ b/elpa/magit-20160218.2137/magit-autoloads.el @@ -3,7 +3,8 @@ ;;; Code: (add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads nil "git-rebase" "git-rebase.el" (22206 293 0 0)) +;;;### (autoloads nil "git-rebase" "git-rebase.el" (22215 7982 0 +;;;;;; 0)) ;;; Generated autoloads from git-rebase.el (autoload 'git-rebase-mode "git-rebase" "\ @@ -22,7 +23,7 @@ running 'man git-rebase' at the command line) for details. ;;;*** -;;;### (autoloads nil "magit" "magit.el" (22206 293 0 0)) +;;;### (autoloads nil "magit" "magit.el" (22215 7982 0 0)) ;;; Generated autoloads from magit.el (autoload 'magit-status "magit" "\ @@ -455,8 +456,8 @@ Git, and Emacs in the echo area. ;;;*** -;;;### (autoloads nil "magit-apply" "magit-apply.el" (22206 293 0 -;;;;;; 0)) +;;;### (autoloads nil "magit-apply" "magit-apply.el" (22215 7982 +;;;;;; 0 0)) ;;; Generated autoloads from magit-apply.el (autoload 'magit-stage-file "magit-apply" "\ @@ -492,8 +493,8 @@ Remove all changes from the staging area. ;;;*** -;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22206 -;;;;;; 293 0 0)) +;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22215 +;;;;;; 7982 0 0)) ;;; Generated autoloads from magit-autorevert.el (defvar magit-revert-buffers t) @@ -521,7 +522,7 @@ See `auto-revert-mode' for more information on Auto-Revert mode. ;;;*** -;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22206 293 +;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22215 7982 ;;;;;; 0 0)) ;;; Generated autoloads from magit-bisect.el (autoload 'magit-bisect-popup "magit-bisect" nil t) @@ -573,8 +574,8 @@ bisect run'. ;;;*** -;;;### (autoloads nil "magit-blame" "magit-blame.el" (22206 293 0 -;;;;;; 0)) +;;;### (autoloads nil "magit-blame" "magit-blame.el" (22215 7982 +;;;;;; 0 0)) ;;; Generated autoloads from magit-blame.el (autoload 'magit-blame-popup "magit-blame" nil t) @@ -598,7 +599,7 @@ only arguments available from `magit-blame-popup' should be used. ;;;*** -;;;### (autoloads nil "magit-commit" "magit-commit.el" (22206 293 +;;;### (autoloads nil "magit-commit" "magit-commit.el" (22215 7982 ;;;;;; 0 0)) ;;; Generated autoloads from magit-commit.el @@ -681,7 +682,8 @@ Create a squash commit targeting COMMIT and instantly rebase. ;;;*** -;;;### (autoloads nil "magit-diff" "magit-diff.el" (22206 293 0 0)) +;;;### (autoloads nil "magit-diff" "magit-diff.el" (22215 7982 0 +;;;;;; 0)) ;;; Generated autoloads from magit-diff.el (autoload 'magit-diff-dwim "magit-diff" "\ @@ -692,7 +694,7 @@ Show changes for the thing at point. (autoload 'magit-diff "magit-diff" "\ Show differences between two commits. -REV-OR-RANGE should be a RANGE or a single revision. If it is a +REV-OR-RANGE should be a range or a single revision. If it is a revision, then show changes in the working tree relative to that revision. If it is a range, but one side is omitted, then show changes relative to `HEAD'. @@ -746,8 +748,8 @@ for a revision. ;;;*** -;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22206 293 0 -;;;;;; 0)) +;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22215 7982 +;;;;;; 0 0)) ;;; Generated autoloads from magit-ediff.el (autoload 'magit-ediff-popup "magit-ediff" nil t) @@ -827,7 +829,7 @@ Show changes introduced by COMMIT using Ediff. ;;;*** -;;;### (autoloads nil "magit-extras" "magit-extras.el" (22206 293 +;;;### (autoloads nil "magit-extras" "magit-extras.el" (22215 7982 ;;;;;; 0 0)) ;;; Generated autoloads from magit-extras.el @@ -898,7 +900,7 @@ on a position in a file-visiting buffer. ;;;*** -;;;### (autoloads nil "magit-log" "magit-log.el" (22206 293 0 0)) +;;;### (autoloads nil "magit-log" "magit-log.el" (22215 7982 0 0)) ;;; Generated autoloads from magit-log.el (autoload 'magit-log-current "magit-log" "\ @@ -966,7 +968,7 @@ Show commits in a branch that are not merged in the upstream branch. ;;;*** -;;;### (autoloads nil "magit-remote" "magit-remote.el" (22206 293 +;;;### (autoloads nil "magit-remote" "magit-remote.el" (22215 7982 ;;;;;; 0 0)) ;;; Generated autoloads from magit-remote.el @@ -1180,8 +1182,8 @@ is asked to pull. START has to be reachable from that commit. ;;;*** -;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22206 -;;;;;; 293 0 0)) +;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22215 +;;;;;; 7982 0 0)) ;;; Generated autoloads from magit-sequence.el (autoload 'magit-sequencer-continue "magit-sequence" "\ @@ -1329,8 +1331,8 @@ Abort the current rebase operation, restoring the original branch. ;;;*** -;;;### (autoloads nil "magit-stash" "magit-stash.el" (22206 293 0 -;;;;;; 0)) +;;;### (autoloads nil "magit-stash" "magit-stash.el" (22215 7982 +;;;;;; 0 0)) ;;; Generated autoloads from magit-stash.el (autoload 'magit-stash-popup "magit-stash" nil t) @@ -1429,8 +1431,8 @@ Show all diffs of a stash in a buffer. ;;;*** -;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22206 -;;;;;; 293 0 0)) +;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22215 +;;;;;; 7982 0 0)) ;;; Generated autoloads from magit-submodule.el (autoload 'magit-submodule-popup "magit-submodule" nil t) @@ -1493,7 +1495,7 @@ These sections can be expanded to show the respective commits. ;;;*** -;;;### (autoloads nil "magit-wip" "magit-wip.el" (22206 293 0 0)) +;;;### (autoloads nil "magit-wip" "magit-wip.el" (22215 7982 0 0)) ;;; Generated autoloads from magit-wip.el (defvar magit-wip-after-save-mode nil "\ @@ -1560,7 +1562,7 @@ command which is about to be called are committed. ;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-mode.el" ;;;;;; "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el") -;;;;;; (22206 293 291654 0)) +;;;;;; (22215 7982 582757 0)) ;;;*** diff --git a/elpa/magit-20160211.2105/magit-autorevert.el b/elpa/magit-20160218.2137/magit-autorevert.el similarity index 100% rename from elpa/magit-20160211.2105/magit-autorevert.el rename to elpa/magit-20160218.2137/magit-autorevert.el diff --git a/elpa/magit-20160211.2105/magit-bisect.el b/elpa/magit-20160218.2137/magit-bisect.el similarity index 100% rename from elpa/magit-20160211.2105/magit-bisect.el rename to elpa/magit-20160218.2137/magit-bisect.el diff --git a/elpa/magit-20160211.2105/magit-blame.el b/elpa/magit-20160218.2137/magit-blame.el similarity index 100% rename from elpa/magit-20160211.2105/magit-blame.el rename to elpa/magit-20160218.2137/magit-blame.el diff --git a/elpa/magit-20160211.2105/magit-commit.el b/elpa/magit-20160218.2137/magit-commit.el similarity index 98% rename from elpa/magit-20160211.2105/magit-commit.el rename to elpa/magit-20160218.2137/magit-commit.el index d49ff7d8..55a4e713 100644 --- a/elpa/magit-20160211.2105/magit-commit.el +++ b/elpa/magit-20160218.2137/magit-commit.el @@ -303,9 +303,13 @@ depending on the value of option `magit-commit-squash-confirm'." (apply-partially 'magit-diff-staged nil)) (`magit-commit-amend 'magit-diff-while-amending) (`magit-commit-reword 'magit-diff-while-amending))) - (let ((magit-inhibit-save-previous-winconf 'unset) - (magit-display-buffer-noselect t)) - (funcall it (car (magit-diff-arguments)))))) + (condition-case nil + (let ((magit-inhibit-save-previous-winconf 'unset) + (magit-display-buffer-noselect t) + (inhibit-quit nil)) + (message "Diffing changes to be committed (C-g to abort diffing)") + (funcall it (car (magit-diff-arguments)))) + (quit)))) (add-hook 'server-switch-hook 'magit-commit-diff) diff --git a/elpa/magit-20160211.2105/magit-core.el b/elpa/magit-20160218.2137/magit-core.el similarity index 100% rename from elpa/magit-20160211.2105/magit-core.el rename to elpa/magit-20160218.2137/magit-core.el diff --git a/elpa/magit-20160211.2105/magit-diff.el b/elpa/magit-20160218.2137/magit-diff.el similarity index 98% rename from elpa/magit-20160211.2105/magit-diff.el rename to elpa/magit-20160218.2137/magit-diff.el index 812ce635..1af889f3 100644 --- a/elpa/magit-20160211.2105/magit-diff.el +++ b/elpa/magit-20160218.2137/magit-diff.el @@ -678,7 +678,7 @@ a \"revA...revB\" range. Otherwise, always construct (defun magit-diff (rev-or-range &optional args files) "Show differences between two commits. -REV-OR-RANGE should be a RANGE or a single revision. If it is a +REV-OR-RANGE should be a range or a single revision. If it is a revision, then show changes in the working tree relative to that revision. If it is a range, but one side is omitted, then show changes relative to `HEAD'. @@ -1226,7 +1226,8 @@ is set in `magit-mode-setup'." (defconst magit-diff-headline-re (concat "^\\(@@@?\\|diff\\|Submodule\\|" - "\\* Unmerged path\\|merged\\|changed in both\\)")) + "\\* Unmerged path\\|merged\\|changed in both\\|" + "added in remote\\|removed in remote\\)")) (defconst magit-diff-statline-re (concat "^ ?" @@ -1323,21 +1324,27 @@ section or a child thereof." 'face 'magit-diff-file-heading)) (insert ?\n)))) t) - ((looking-at "^\\(merged\\|changed in both\\)") - (let ((status (if (equal (match-string 1) "merged") 'merged 'conflict)) - file orig modes) + ((looking-at (concat "^\\(merged\\|changed in both\\|" + "added in remote\\|removed in remote\\)")) + (let ((status (pcase (match-string 1) + ("merged" "merged") + ("changed in both" "conflict") + ("added in remote" "new file") + ("removed in remote" "deleted"))) + file orig base modes) (magit-delete-line) (while (looking-at "^ \\([^ ]+\\) +[0-9]\\{6\\} \\([a-z0-9]\\{40\\}\\) \\(.+\\)$") (magit-bind-match-strings (side _blob name) nil (pcase side ("result" (setq file name)) - ("our" (setq orig name)) - ("their" (setq file name)))) + ("our" (setq orig name)) + ("their" (setq file name)) + ("base" (setq base name)))) (magit-delete-line)) - (setq orig (magit-decode-git-path orig)) - (setq file (magit-decode-git-path file)) - (magit-diff-insert-file-section file orig status modes nil))) + (when orig (setq orig (magit-decode-git-path orig))) + (when file (setq file (magit-decode-git-path file))) + (magit-diff-insert-file-section (or file base) orig status modes nil))) ((looking-at "^diff --\\(?:\\(git\\) \\(?:\\(.+?\\) \\2\\)?\\|\\(cc\\|combined\\) \\(.+\\)\\)") (let ((status (cond ((equal (match-string 1) "git") "modified") diff --git a/elpa/magit-20160211.2105/magit-ediff.el b/elpa/magit-20160218.2137/magit-ediff.el similarity index 100% rename from elpa/magit-20160211.2105/magit-ediff.el rename to elpa/magit-20160218.2137/magit-ediff.el diff --git a/elpa/magit-20160211.2105/magit-extras.el b/elpa/magit-20160218.2137/magit-extras.el similarity index 100% rename from elpa/magit-20160211.2105/magit-extras.el rename to elpa/magit-20160218.2137/magit-extras.el diff --git a/elpa/magit-20160211.2105/magit-git.el b/elpa/magit-20160218.2137/magit-git.el similarity index 99% rename from elpa/magit-20160211.2105/magit-git.el rename to elpa/magit-20160218.2137/magit-git.el index 61240785..5b61259a 100644 --- a/elpa/magit-20160211.2105/magit-git.el +++ b/elpa/magit-20160218.2137/magit-git.el @@ -902,7 +902,7 @@ If no such tag can be found or if the distance is 0 (in which case it is the current tag, not the next) return nil instead. If optional WITH-DISTANCE is non-nil then return (TAG COMMITS) where COMMITS is the number of commits in TAG but not in REV." - (--when-let (magit-git-string "describe" "--contains" (or rev "HEAD")) + (--when-let (magit-git-str "describe" "--contains" (or rev "HEAD")) (save-match-data (when (string-match "^[^^~]+" it) (setq it (match-string 0 it)) diff --git a/elpa/magit-20160211.2105/magit-log.el b/elpa/magit-20160218.2137/magit-log.el similarity index 99% rename from elpa/magit-20160211.2105/magit-log.el rename to elpa/magit-20160218.2137/magit-log.el index 72f4d4a6..aed85bda 100644 --- a/elpa/magit-20160211.2105/magit-log.el +++ b/elpa/magit-20160218.2137/magit-log.el @@ -41,6 +41,7 @@ (declare-function magit-show-commit 'magit) (defvar magit-refs-indent-cherry-lines) (defvar magit-refs-show-commit-count) +(defvar magit-status-sections-hook) (require 'ansi-color) (require 'crm) @@ -1296,8 +1297,10 @@ Type \\[magit-reset] to reset HEAD to the commit at point. (--when-let (magit-get-push-branch) (unless (and (equal (magit-rev-name it) (magit-rev-name "@{upstream}")) - (memq 'magit-insert-unpulled-from-upstream - magit-status-sections-hook)) + (or (memq 'magit-insert-unpulled-from-upstream + magit-status-sections-hook) + (memq 'magit-insert-unpulled-from-upstream-or-recent + magit-status-sections-hook))) (magit-insert-section (unpulled (concat ".." it)) (magit-insert-heading (format (propertize "Unpulled from %s:" 'face 'magit-section-heading) diff --git a/elpa/magit-20160211.2105/magit-mode.el b/elpa/magit-20160218.2137/magit-mode.el similarity index 100% rename from elpa/magit-20160211.2105/magit-mode.el rename to elpa/magit-20160218.2137/magit-mode.el diff --git a/elpa/magit-20160211.2105/magit-pkg.el b/elpa/magit-20160218.2137/magit-pkg.el similarity index 82% rename from elpa/magit-20160211.2105/magit-pkg.el rename to elpa/magit-20160218.2137/magit-pkg.el index d9b98e1a..b8ad35f8 100644 --- a/elpa/magit-20160211.2105/magit-pkg.el +++ b/elpa/magit-20160218.2137/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20160211.2105" "A Git porcelain inside Emacs" +(define-package "magit" "20160218.2137" "A Git porcelain inside Emacs" '((emacs "24.4") (async "20150909.2257") (dash "20151021.113") diff --git a/elpa/magit-20160211.2105/magit-process.el b/elpa/magit-20160218.2137/magit-process.el similarity index 98% rename from elpa/magit-20160211.2105/magit-process.el rename to elpa/magit-20160218.2137/magit-process.el index 563e77b2..918c94c9 100644 --- a/elpa/magit-20160211.2105/magit-process.el +++ b/elpa/magit-20160218.2137/magit-process.el @@ -337,11 +337,17 @@ flattened before use." (while (and magit-this-process (eq (process-status magit-this-process) 'run)) (sleep-for 0.005))) - (let ((process-environment (append (magit-cygwin-env-vars) - process-environment))) - (apply #'call-process-region (point-min) (point-max) - magit-git-executable nil nil nil - (magit-process-git-arguments args))))) + (run-hooks 'magit-pre-call-git-hook) + (-let* ((process-environment (append (magit-cygwin-env-vars) + process-environment)) + (flat-args (magit-process-git-arguments args)) + ((process-buf . section) + (magit-process-setup magit-git-executable flat-args)) + (inhibit-read-only t)) + (magit-process-finish + (apply #'call-process-region (point-min) (point-max) + magit-git-executable nil process-buf nil flat-args) + process-buf nil default-directory section)))) (defun magit-run-git-with-logfile (file &rest args) "Call Git in a separate process and log its output to FILE. @@ -790,7 +796,7 @@ as argument." (match-string 1)))))) "Git failed"))) (if magit-process-raise-error - (signal 'magit-git-error msg) + (signal 'magit-git-error (format "%s (in %s)" msg default-dir)) (--when-let (magit-mode-get-buffer 'magit-status-mode) (setq magit-this-error msg)) (message "%s ... [%s buffer %s for details]" msg diff --git a/elpa/magit-20160211.2105/magit-remote.el b/elpa/magit-20160218.2137/magit-remote.el similarity index 100% rename from elpa/magit-20160211.2105/magit-remote.el rename to elpa/magit-20160218.2137/magit-remote.el diff --git a/elpa/magit-20160211.2105/magit-section.el b/elpa/magit-20160218.2137/magit-section.el similarity index 100% rename from elpa/magit-20160211.2105/magit-section.el rename to elpa/magit-20160218.2137/magit-section.el diff --git a/elpa/magit-20160211.2105/magit-sequence.el b/elpa/magit-20160218.2137/magit-sequence.el similarity index 100% rename from elpa/magit-20160211.2105/magit-sequence.el rename to elpa/magit-20160218.2137/magit-sequence.el diff --git a/elpa/magit-20160211.2105/magit-stash.el b/elpa/magit-20160218.2137/magit-stash.el similarity index 100% rename from elpa/magit-20160211.2105/magit-stash.el rename to elpa/magit-20160218.2137/magit-stash.el diff --git a/elpa/magit-20160211.2105/magit-submodule.el b/elpa/magit-20160218.2137/magit-submodule.el similarity index 100% rename from elpa/magit-20160211.2105/magit-submodule.el rename to elpa/magit-20160218.2137/magit-submodule.el diff --git a/elpa/magit-20160211.2105/magit-utils.el b/elpa/magit-20160218.2137/magit-utils.el similarity index 100% rename from elpa/magit-20160211.2105/magit-utils.el rename to elpa/magit-20160218.2137/magit-utils.el diff --git a/elpa/magit-20160211.2105/magit-wip.el b/elpa/magit-20160218.2137/magit-wip.el similarity index 100% rename from elpa/magit-20160211.2105/magit-wip.el rename to elpa/magit-20160218.2137/magit-wip.el diff --git a/elpa/magit-20160211.2105/magit.el b/elpa/magit-20160218.2137/magit.el similarity index 99% rename from elpa/magit-20160211.2105/magit.el rename to elpa/magit-20160218.2137/magit.el index 1480f7f5..1117f793 100644 --- a/elpa/magit-20160211.2105/magit.el +++ b/elpa/magit-20160218.2137/magit.el @@ -196,7 +196,10 @@ The functions which respect this option are all Show counts for branches and tags. branch Show counts for branches only. -nil Never show counts." +nil Never show counts. + +To change the value in an existing buffer use the command +`magit-refs-show-commit-count'" :package-version '(magit . "2.1.0") :group 'magit-refs :safe (lambda (val) (memq val '(all branch nil))) diff --git a/elpa/magit-20160211.2105/magit.info b/elpa/magit-20160218.2137/magit.info similarity index 65% rename from elpa/magit-20160211.2105/magit.info rename to elpa/magit-20160218.2137/magit.info index 957ce501..96bd694b 100644 --- a/elpa/magit-20160211.2105/magit.info +++ b/elpa/magit-20160218.2137/magit.info @@ -27,7 +27,7 @@ END-INFO-DIR-ENTRY  Indirect: magit.info-1: 1222 -magit.info-2: 314834 +magit.info-2: 314831  Tag Table: (Indirect) @@ -102,58 +102,58 @@ Node: Stashing166385 Node: Transferring169530 Node: Remotes169768 Node: Fetching171054 -Node: Pulling172151 -Node: Pushing172997 -Node: Creating and sending patches177446 -Node: Applying patches178141 -Node: Miscellaneous179139 -Node: Tagging179430 -Node: Notes180215 -Node: Submodules182740 -Node: Common commands184060 -Node: Wip modes185808 -Node: Minor mode for buffers visiting files192544 -Node: Minor mode for buffers visiting blobs194687 -Node: Customizing195492 -Node: Per-repository configuration197164 -Node: Essential settings198798 -Node: Safety199122 -Node: Performance200955 -Node: Plumbing207184 -Node: Calling Git207812 -Node: Getting a value from Git209335 -Node: Calling Git for effect212439 -Node: Section plumbing218943 -Node: Creating sections219171 -Node: Section selection222974 -Node: Matching sections224654 -Node: Refreshing buffers229856 -Node: Conventions232991 -Node: Confirmation and completion233168 -Node: Theming Faces234066 -Node: FAQ242217 -Node: Magit is slow243550 -Node: I changed several thousand files at once and now Magit is unusable243751 -Node: I am having problems committing244467 -Node: I don't understand how branching and pushing work244925 -Node: I don't like the key binding in v24245294 -Node: I cannot install the pre-requisites for Magit v2245633 -Node: I am using an Emacs release older than v244246098 -Node: I am using a Git release older than v194247711 -Node: I am using MS Windows and cannot push with Magit248698 -Node: How to install the gitman info manual?249277 -Node: How can I show Git's output?251805 -Node: Expanding a file to show the diff causes it to disappear252617 -Node: Point is wrong in the COMMIT_EDITMSG buffer253143 -Node: Can Magit be used as ediff-version-control-package?254161 -Node: How to show diffs for gpg-encrypted files?256185 -Node: Emacs 245 hangs when loading Magit256776 -Node: Symbol's value as function is void --some257345 -Node: Where is the branch manager257665 -Node: Keystroke Index257950 -Node: Command Index285296 -Node: Function Index314834 -Node: Variable Index326617 +Node: Pulling172148 +Node: Pushing172994 +Node: Creating and sending patches177443 +Node: Applying patches178138 +Node: Miscellaneous179136 +Node: Tagging179427 +Node: Notes180212 +Node: Submodules182737 +Node: Common commands184057 +Node: Wip modes185805 +Node: Minor mode for buffers visiting files192541 +Node: Minor mode for buffers visiting blobs194684 +Node: Customizing195489 +Node: Per-repository configuration197161 +Node: Essential settings198795 +Node: Safety199119 +Node: Performance200952 +Node: Plumbing207181 +Node: Calling Git207809 +Node: Getting a value from Git209332 +Node: Calling Git for effect212436 +Node: Section plumbing218940 +Node: Creating sections219168 +Node: Section selection222971 +Node: Matching sections224651 +Node: Refreshing buffers229853 +Node: Conventions232988 +Node: Confirmation and completion233165 +Node: Theming Faces234063 +Node: FAQ242214 +Node: Magit is slow243547 +Node: I changed several thousand files at once and now Magit is unusable243748 +Node: I am having problems committing244464 +Node: I don't understand how branching and pushing work244922 +Node: I don't like the key binding in v24245291 +Node: I cannot install the pre-requisites for Magit v2245630 +Node: I am using an Emacs release older than v244246095 +Node: I am using a Git release older than v194247708 +Node: I am using MS Windows and cannot push with Magit248695 +Node: How to install the gitman info manual?249274 +Node: How can I show Git's output?251802 +Node: Expanding a file to show the diff causes it to disappear252614 +Node: Point is wrong in the COMMIT_EDITMSG buffer253140 +Node: Can Magit be used as ediff-version-control-package?254158 +Node: How to show diffs for gpg-encrypted files?256182 +Node: Emacs 245 hangs when loading Magit256773 +Node: Symbol's value as function is void --some257342 +Node: Where is the branch manager257662 +Node: Keystroke Index257947 +Node: Command Index285293 +Node: Function Index314831 +Node: Variable Index326614  End Tag Table diff --git a/elpa/magit-20160211.2105/magit.info-1 b/elpa/magit-20160218.2137/magit.info-1 similarity index 99% rename from elpa/magit-20160211.2105/magit.info-1 rename to elpa/magit-20160218.2137/magit.info-1 index 095a5c98..4aab0fd8 100644 --- a/elpa/magit-20160211.2105/magit.info-1 +++ b/elpa/magit-20160218.2137/magit.info-1 @@ -4610,7 +4610,7 @@ _push-remote_, see *note Branching: Branching. ‘f u’ (‘magit-fetch-from-upstream’) - Fetch from the push-remote of the current branch. + Fetch from the upstream of the current branch. ‘f e’ (‘magit-fetch’) diff --git a/elpa/magit-20160211.2105/magit.info-2 b/elpa/magit-20160218.2137/magit.info-2 similarity index 100% rename from elpa/magit-20160211.2105/magit.info-2 rename to elpa/magit-20160218.2137/magit.info-2 -- 2.47.3