X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fcore-tutorial.txt;h=4211c8197243146e9c92653edd00796e13b98003;hb=52b70d56bd23811003a72866cc23a0a44b9da1b7;hp=c3eaa38b54f0f171791a46d13752d04935434f6d;hpb=960c7021b3b90f93aa88358435d828e5f4cd1533;p=git.git diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index c3eaa38b..4211c819 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