diff options
| author | Jonathan Nieder <jrnieder@uchicago.edu> | 2008-07-03 09:49:55 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-05 22:24:40 +0400 |
| commit | 42d36bb841eb035eb0f7261f02987893c14e1a02 (patch) | |
| tree | 08fb3a348d090e9465f3d323034754ed728016b2 /Documentation/gitcore-tutorial.txt | |
| parent | ba020ef5eb5fca3d757bd580ff117adaf81ca079 (diff) | |
manpages: italicize gitk's name (where it was in teletype font)
The name `gitk` is sometimes meant to be entered at the command
prompt, but most uses are just referring to the program with that
name (not the incantation to start it).
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
| -rw-r--r-- | Documentation/gitcore-tutorial.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index 2bbe7dea37..3eba973a2b 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -878,7 +878,7 @@ means: normally it will just show you your current `HEAD`) and their histories. You can also see exactly how they came to be from a common source. -Anyway, let's exit `gitk` (`^Q` or the File menu), and decide that we want +Anyway, let's exit 'gitk' (`^Q` or the File menu), and decide that we want to merge the work we did on the `mybranch` branch into the `master` branch (which is currently our `HEAD` too). To do that, there's a nice script called 'git-merge', which wants to know which branches you want |