diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-08-13 01:23:00 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-08-13 01:23:00 +0000 |
| commit | 27a128bdf7d0ab4b37022233ba5ae84a8ebd605f (patch) | |
| tree | 899c40ef171884bcc7c8db4a798e44c506bed715 /git-merge.txt | |
| parent | 9f88386765adc1aacb4a0e3b488c69cffc59ca70 (diff) | |
| download | git-htmldocs-27a128bdf7d0ab4b37022233ba5ae84a8ebd605f.tar.gz | |
Autogenerated HTML docs for v1.6.4-122-g6ffd7
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 c04ae739e..af68d694a 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]... - [-m <msg>] <remote> <remote>... + [-m <msg>] <remote>... 'git merge' <msg> HEAD <remote>... DESCRIPTION |