aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc/vc-git.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b87d79bb573..4db7671a10b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-01-22 Glenn Morris <rgm@gnu.org> 12014-01-22 Glenn Morris <rgm@gnu.org>
2 2
3 * vc/vc-git.el (vc-git-print-log): Remove --follow;
4 reverts 2014-01-09 change. (Bug#16422)
5
3 * calc/calc-embed.el (thing-at-point-looking-at): 6 * calc/calc-embed.el (thing-at-point-looking-at):
4 * emacs-lisp/map-ynp.el (x-popup-dialog): 7 * emacs-lisp/map-ynp.el (x-popup-dialog):
5 * obsolete/lmenu.el (x-popup-dialog): 8 * obsolete/lmenu.el (x-popup-dialog):
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 6706300a377..06e46eeb663 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -791,7 +791,7 @@ If LIMIT is non-nil, show no more than this many entries."
791 (apply 'vc-git-command buffer 791 (apply 'vc-git-command buffer
792 'async files 792 'async files
793 (append 793 (append
794 '("log" "--no-color" "--follow") 794 '("log" "--no-color")
795 (when shortlog 795 (when shortlog
796 `("--graph" "--decorate" "--date=short" 796 `("--graph" "--decorate" "--date=short"
797 ,(format "--pretty=tformat:%s" 797 ,(format "--pretty=tformat:%s"