diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-15 15:53:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-15 15:53:37 -0700 |
| commit | da27f4f3f4c23d0276a372726ed050ed13e45168 (patch) | |
| tree | 8842fbebf0db214d0bc8c68e2918a712b7edede3 /Documentation/git-merge-one-file-script.txt | |
| parent | Merge master into rc (diff) | |
| parent | [PATCH] Add documentation for git repack and git-prune-packed. (diff) | |
| download | tgif-da27f4f3f4c23d0276a372726ed050ed13e45168.tar.xz | |
Merge master changes into rc.
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 -------------- |