diff options
| author | Sergei Organov <osv@javad.com> | 2007-10-30 22:54:02 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-30 16:35:07 -0700 |
| commit | ba17892ddc85c0ffe8fecd600c29cb38ec7e5587 (patch) | |
| tree | 8e7f67fa3de59d630ef83cbd5e89155ecc1d1117 | |
| parent | dee48c3c7ed7f7a32a524e8a492c6bc4e3c1c78d (diff) | |
| download | git-ba17892ddc85c0ffe8fecd600c29cb38ec7e5587.tar.gz git-ba17892ddc85c0ffe8fecd600c29cb38ec7e5587.tar.xz | |
core-tutorial: Use new syntax for git-merge.
"git-merge <msg> HEAD <other branches>" is still supported but
we shouldn't encourage its use.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/core-tutorial.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index 6b2590d07..df147b5e7 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -883,7 +883,7 @@ script called `git merge`, which wants to know which branches you want to resolve and what the merge is all about: ------------ -$ git merge "Merge work in mybranch" HEAD mybranch +$ git merge -m "Merge work in mybranch" mybranch ------------ where the first argument is going to be used as the commit message if @@ -970,7 +970,7 @@ to the `master` branch. Let's go back to `mybranch`, and run ------------ $ git checkout mybranch -$ git merge "Merge upstream changes." HEAD master +$ git merge -m "Merge upstream changes." master ------------ This outputs something like this (the actual commit object names @@ -1613,8 +1613,8 @@ in both of them. You could merge in 'diff-fix' first and then 'commit-fix' next, like this: ------------ -$ git merge 'Merge fix in diff-fix' master diff-fix -$ git merge 'Merge fix in commit-fix' master commit-fix +$ git merge -m 'Merge fix in diff-fix' diff-fix +$ git merge -m 'Merge fix in commit-fix' commit-fix ------------ Which would result in: |