diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-02 16:56:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-02 16:56:42 -0700 |
| commit | e3d6d56f1c2097f13a427e158638e5e0918e5705 (patch) | |
| tree | 0477acbfdb7994663be7f22a5ae836e384a2dc6f /Documentation/core-tutorial.txt | |
| parent | 3d66dc9657f195cb241387a87bcdd5709abd8a21 (diff) | |
| parent | f45e867b1a60a2023c18719888bb52965ade7192 (diff) | |
| download | git-e3d6d56f1c2097f13a427e158638e5e0918e5705.tar.gz git-e3d6d56f1c2097f13a427e158638e5e0918e5705.tar.xz | |
Merge branch 'maint'
* maint:
Fixing path quoting in git-rebase
Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.
Documentation: quote commit messages consistently.
Remove escaping of '|' in manpage option sections
Diffstat (limited to 'Documentation/core-tutorial.txt')
| -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 5df97a1f9..99817c533 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -828,7 +828,7 @@ that branch, and do some work there. ------------------------------------------------ $ git checkout mybranch $ echo "Work, work, work" >>hello -$ git commit -m 'Some work.' -i hello +$ git commit -m "Some work." -i hello ------------------------------------------------ Here, we just added another line to `hello`, and we used a shorthand for @@ -853,7 +853,7 @@ hasn't happened in the `master` branch at all. Then do ------------ $ echo "Play, play, play" >>hello $ echo "Lots of fun" >>example -$ git commit -m 'Some fun.' -i hello example +$ git commit -m "Some fun." -i hello example ------------ since the master branch is obviously in a much better mood. @@ -1607,8 +1607,8 @@ in both of them. You could merge in 'diff-fix' first and then 'commit-fix' next, like this: ------------ -$ git merge -m 'Merge fix in diff-fix' diff-fix -$ git merge -m 'Merge fix in commit-fix' 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: |