From: Patrick Steinhardt Date: Thu, 19 Nov 2026 11:47:14 GMT Subject: [PATCH v5 13/13] Documentation/git-rerere: drop claim that we pass args to diff(1) Message-ID: <20261119-pks-rerere-subcommands-v5-13-0c1092b88958@pks.im> In-Reply-To: <20261119-pks-rerere-subcommands-v5-0-0c1092b88958@pks.im> Back in the old days, `git rerere diff` accepted arbitrary arguments that would be passed on to the system `diff` command. This has changed in 658f3650273 (Make git-rerere a builtin, 2006-12-20), even though that change seems to have been unintentional. And in fact, our documentation still claims that arbitrary arguments are accepted. While the original change was unintended, nobody has complained in the last two decades, so it's rather unlikely that anybody cares about this regression nowadays. Adapt the documentation to match current behaviour. Suggested-by: Junio C Hamano Signed-off-by: Patrick Steinhardt --- Documentation/git-rerere.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/git-rerere.adoc b/Documentation/git-rerere.adoc index e04e9ef3ef8..2a5b443610a 100644 --- a/Documentation/git-rerere.adoc +++ b/Documentation/git-rerere.adoc @@ -56,8 +56,7 @@ conflicts in paths that match . Display diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving -conflicts. Additional arguments are passed directly to the system -'diff' command installed in PATH. +conflicts. 'status':: -- 2.56.1.831.g720f3f5937.dirty