From dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 5 Jun 2005 15:31:52 -0700 Subject: diff 'rename' format change. Clearly even Junio felt git "rename" header lines should say "from/to" instead of "old/new", since he wrote the documentation that way. This way it also matches "copy". git-apply will accept both versions, at least for a while. --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index 2762905b5..046d9a392 100644 --- a/diff.c +++ b/diff.c @@ -786,8 +786,8 @@ static void diff_flush_patch(struct diff_filepair *p) case 'R': sprintf(msg_, "similarity index %d%%\n" - "rename old %s\n" - "rename new %s", + "rename from %s\n" + "rename to %s", (int)(0.5 + p->score * 100.0/MAX_SCORE), p->one->path, p->two->path); msg = msg_; -- cgit v1.2.1