From ce89dc22bcc9af6707e265b8748c55e4bfbc3598 Mon Sep 17 00:00:00 2001 From: Kunal Marwaha Date: Tue, 18 Dec 2018 19:27:47 -0800 Subject: [PATCH 1/2] change `edit` to `nano` --- setup.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.md b/setup.md index 456cf814..3854e6e0 100644 --- a/setup.md +++ b/setup.md @@ -22,8 +22,9 @@ The email address should be the same one you used when setting up your GitHub ac By default, Git will open the Vi / Vim text editor to request commit messages (for example when merging conflicts). To avoid confusion, most people will want to change the default editor to something more familiar using the `core.editor` config. -Any text editor can be made default by adding the correct file path and command line options (see [GitHub help](https://help.github.com/articles/associating-text-editors-with-git/)). -However, the simplest `core.editor` values are `"notepad"` on Windows, `"edit -w"` on Mac, and `"nano -w"` on Linux. +Any text +or can be made default by adding the correct file path and command line options (see [GitHub help](https://help.github.com/articles/associating-text-editors-with-git/)). +However, the simplest `core.editor` values are `"notepad"` on Windows, `"nano -w"` on Mac, and `"nano -w"` on Linux. For example: ~~~ From 13588c2dd854597cecc4f9cf6c104b8cc7650a5f Mon Sep 17 00:00:00 2001 From: Katrin Leinweber <9948149+katrinleinweber@users.noreply.github.com> Date: Thu, 20 Dec 2018 16:37:59 +0100 Subject: [PATCH 2/2] Fix typo --- setup.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.md b/setup.md index 3854e6e0..5d6d6d8d 100644 --- a/setup.md +++ b/setup.md @@ -22,8 +22,7 @@ The email address should be the same one you used when setting up your GitHub ac By default, Git will open the Vi / Vim text editor to request commit messages (for example when merging conflicts). To avoid confusion, most people will want to change the default editor to something more familiar using the `core.editor` config. -Any text -or can be made default by adding the correct file path and command line options (see [GitHub help](https://help.github.com/articles/associating-text-editors-with-git/)). +Any text editor can be made default by adding the correct file path and command line options (see [GitHub help](https://help.github.com/articles/associating-text-editors-with-git/)). However, the simplest `core.editor` values are `"notepad"` on Windows, `"nano -w"` on Mac, and `"nano -w"` on Linux. For example: