diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-16 12:22:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-16 05:15:28 -0800 |
| commit | 9abaa7f033283f84ba8372192f9d4a165fb09ce4 (patch) | |
| tree | 797be516bf362e1b478d2884fc0871c47d6e96d1 /Documentation/git.txt | |
| parent | a2e88b35808a8c0334f169c9cbb2301764fb9e5a (diff) | |
| download | git-9abaa7f033283f84ba8372192f9d4a165fb09ce4.tar.gz | |
Document git-merge-file
Most of this is derived from the documentation of RCS merge.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 6382ef0a02..2a9e97dac1 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -351,6 +351,9 @@ gitlink:git-init-db[1]:: Creates an empty git object database, or reinitialize an existing one. +gitlink:git-merge-file[1]:: + Runs a threeway merge. + gitlink:git-merge-index[1]:: Runs a merge for files needing merging. |