From 3f971fc425bca3d9e97b04e9db39e4d5e43921bc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 14 Aug 2005 17:24:36 -0700 Subject: Documentation updates. Linus brought up that documentation for many commands have incorrect attribution. I started counting lines again, but ended up adding a handful of missing manual pages. Signed-off-by: Junio C Hamano --- Documentation/git-merge-one-file-script.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Documentation/git-merge-one-file-script.txt') diff --git a/Documentation/git-merge-one-file-script.txt b/Documentation/git-merge-one-file-script.txt index 387601d7e4..1cfe9548e1 100644 --- a/Documentation/git-merge-one-file-script.txt +++ b/Documentation/git-merge-one-file-script.txt @@ -1,6 +1,6 @@ git-merge-one-file-script(1) ============================ -v0.1, May 2005 +v0.99.4, Aug 2005 NAME ---- @@ -18,7 +18,8 @@ to resolve a merge after the trivial merge done with "git-read-tree -m". Author ------ -Written by Linus Torvalds +Written by Linus Torvalds , +Junio C Hamano and Petr Baudis . Documentation -------------- -- cgit v1.2.3