From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Sep 2015 02:16:54 +0000 (-0700)
Subject: Sync with v2.5.4
X-Git-Tag: v2.6.1~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3adc4ec7b9e1d2118501728a75a5b93d971974fa

Sync with v2.5.4
---

3adc4ec7b9e1d2118501728a75a5b93d971974fa
diff --cc Documentation/git.txt
index b37cfcefcd,1a262757dc..f9a7fb94c5
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,14 -43,10 +43,15 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.6.0/git.html[documentation for release 2.6]
 +
 +* release notes for
 +  link:RelNotes/2.6.0.txt[2.6].
 +
- * link:v2.5.3/git.html[documentation for release 2.5.3]
+ * link:v2.5.4/git.html[documentation for release 2.5.4]
  
  * release notes for
+   link:RelNotes/2.5.4.txt[2.5.4],
    link:RelNotes/2.5.3.txt[2.5.3],
    link:RelNotes/2.5.2.txt[2.5.2],
    link:RelNotes/2.5.1.txt[2.5.1],
diff --cc builtin/rerere.c
index 12535c9b4f,be55e0d2a7..88e1359ebc
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@@ -104,9 -105,10 +105,10 @@@ int cmd_rerere(int argc, const char **a
  		for (i = 0; i < merge_rr.nr; i++) {
  			const char *path = merge_rr.items[i].string;
  			const char *name = (const char *)merge_rr.items[i].util;
- 			diff_two(rerere_path(name, "preimage"), path, path, path);
+ 			if (diff_two(rerere_path(name, "preimage"), path, path, path))
+ 				die("unable to generate diff for %s", name);
  		}
 -	else
 +	} else
  		usage_with_options(rerere_usage, options);
  
  	string_list_clear(&merge_rr, 1);