diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 15:31:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 15:31:52 -0700 |
commit | dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0 (patch) | |
tree | 5e1c39a01feb2364f97f2c0c72e4a5870af9a69d /diff.c | |
parent | f7b797073c2286fff8c4d46842ed00d868f3b2fa (diff) | |
download | git-dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0.tar.gz git-dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0.tar.xz |
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.
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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_; |