From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 9 Jan 2014 16:46:56 +0000 (-0500)
Subject: Minor bug fix.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2^2~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f29778b343bc352a550033ab3d3e19e5a3ba677a;p=emacs.git

Minor bug fix.

Fixes: debbugs:8756
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 481c3cbc04a..fa07f2ded55 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+<<<<<<< TREE
+2014-01-09  Eric S. Raymond  <esr@thyrsus.com>
+
+	* vc/vc-git.el (vc-git-print-log): Add --follow option to command,
+	following renames and addressing Debian bug 8756.
+
 2014-01-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* simple.el (deactivate-mark, activate-mark): Force-mode-line-update
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 06e46eeb663..6706300a377 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."
 	(apply 'vc-git-command buffer
 	       'async files
 	       (append
-		'("log" "--no-color")
+		'("log" "--no-color" "--follow")
 		(when shortlog
 		  `("--graph" "--decorate" "--date=short"
                     ,(format "--pretty=tformat:%s"