diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-04-14 14:07:36 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-04-14 14:07:36 +0000 |
| commit | b04bb3fbb5c8461cde3fdfe283963c01fc97b518 (patch) | |
| tree | 9c8289642a72748e3c12d13beecd35716b3c87b9 /git-merge.txt | |
| parent | 0e8c0b027943f592a2cc9d3752b32aba046a9f19 (diff) | |
| download | git-htmldocs-b04bb3fbb5c8461cde3fdfe283963c01fc97b518.tar.gz | |
Autogenerated HTML docs for v1.7.1-rc1-12-ga601
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 9c9618cea..c2325ef90 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -9,7 +9,8 @@ git-merge - Join two or more development histories together SYNOPSIS -------- [verse] -'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]... +'git merge' [-n] [--stat] [--no-commit] [--squash] + [-s <strategy>] [-X <strategy-option>] [--[no-]rerere-autoupdate] [-m <msg>] <commit>... 'git merge' <msg> HEAD <commit>... |