diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-14 17:24:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-14 17:24:36 -0700 |
| commit | 3f971fc425bca3d9e97b04e9db39e4d5e43921bc (patch) | |
| tree | b1e0b079a4143355e3f826f15b87383456dedcc9 /Documentation/git-merge-one-file-script.txt | |
| parent | 068eac91ce04b9aca163acb1927c3878c45d1a07 (diff) | |
| download | git-3f971fc425bca3d9e97b04e9db39e4d5e43921bc.tar.gz | |
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 <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-one-file-script.txt')
| -rw-r--r-- | Documentation/git-merge-one-file-script.txt | 5 |
1 files changed, 3 insertions, 2 deletions
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 <torvalds@osdl.org> +Written by Linus Torvalds <torvalds@osdl.org>, +Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>. Documentation -------------- |