projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git log [diff-tree options]...
[git.git]
/
Documentation
/
core-tutorial.txt
diff --git
a/Documentation/core-tutorial.txt
b/Documentation/core-tutorial.txt
index
c3eaa38
..
4211c81
100644
(file)
--- a/
Documentation/core-tutorial.txt
+++ b/
Documentation/core-tutorial.txt
@@
-852,7
+852,7
@@
that branch, and do some work there.
------------------------------------------------
$ git checkout mybranch
$ echo "Work, work, work" >>hello
------------------------------------------------
$ git checkout mybranch
$ echo "Work, work, work" >>hello
-$ git commit -m 'Some work.' hello
+$ git commit -m 'Some work.'
-i
hello
------------------------------------------------
Here, we just added another line to `hello`, and we used a shorthand for
------------------------------------------------
Here, we just added another line to `hello`, and we used a shorthand for
@@
-877,7
+877,7
@@
hasn't happened in the `master` branch at all. Then do
------------
$ echo "Play, play, play" >>hello
$ echo "Lots of fun" >>example
------------
$ echo "Play, play, play" >>hello
$ echo "Lots of fun" >>example
-$ git commit -m 'Some fun.' hello example
+$ git commit -m 'Some fun.'
-i
hello example
------------
since the master branch is obviously in a much better mood.
------------
since the master branch is obviously in a much better mood.
@@
-942,7
+942,7
@@
Work, work, work
and once you're happy with your manual merge, just do a
------------
and once you're happy with your manual merge, just do a
------------
-$ git commit hello
+$ git commit
-i
hello
------------
which will very loudly warn you that you're now committing a merge
------------
which will very loudly warn you that you're now committing a merge