diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-05-29 09:18:19 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-05-29 09:18:19 +0000 |
| commit | 591dc6ae2b927354f3011bedf81ae623d9014627 (patch) | |
| tree | fb312d421fad3f6490199fc6812d60fffa4c9ad1 /git-merge.txt | |
| parent | 36460981d4d516642ddd8ee3afd442552a28a48a (diff) | |
| download | git-htmldocs-591dc6ae2b927354f3011bedf81ae623d9014627.tar.gz | |
Autogenerated HTML docs for v1.5.2-136-g322bc
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 9c08efa53..912ef29ef 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -9,7 +9,7 @@ git-merge - Join two or more development histories together SYNOPSIS -------- [verse] -'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]... +'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]... [-m <msg>] <remote> <remote>... DESCRIPTION |