summaryrefslogtreecommitdiff
path: root/Documentation/core-tutorial.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/core-tutorial.txt')
-rw-r--r--Documentation/core-tutorial.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt
index c3eaa38..4211c81 100644
--- 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 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
@@ -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
-$ 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.
@@ -942,7 +942,7 @@ Work, work, work
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