diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-01 17:36:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-01 17:36:37 -0800 |
| commit | 795a5a34d9b6379bc413201d8b038b0d1aac2391 (patch) | |
| tree | c829dcae052f531fbb014069fa6fea05f2571cd0 /git-merge.txt | |
| parent | 56bcc4f4cfe44a679201097e7d9a72695ad7566c (diff) | |
| download | git-htmldocs-795a5a34d9b6379bc413201d8b038b0d1aac2391.tar.gz | |
Autogenerated HTML docs for v1.7.9-111-gf3fb0
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 e2e6aba17..3ceefb8a1 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] [--stat] [--no-commit] [--squash] +'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] [-s <strategy>] [-X <strategy-option>] [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] 'git merge' <msg> HEAD <commit>... |