You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Replace Mac with macOS when referring to the operating system
Apple's operating system for Macintosh computers is called macOS
(previously Mac OS). Referring to it with "on Mac" is not that common.
Alternatively, "on a Mac" can be used.
Copy file name to clipboardExpand all lines: book/01-introduction/sections/command-line.asc
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -7,5 +7,5 @@ For one, the command line is the only place you can run _all_ Git commands -- mo
7
7
If you know how to run the command-line version, you can probably also figure out how to run the GUI version, while the opposite is not necessarily true.
8
8
Also, while your choice of graphical client is a matter of personal taste, _all_ users will have the command-line tools installed and available.
9
9
10
-
So we will expect you to know how to open Terminal in Mac or Command Prompt or PowerShell in Windows.
10
+
So we will expect you to know how to open Terminal in macOS or Command Prompt or PowerShell in Windows.
11
11
If you don't know what we're talking about here, you may need to stop and research that quickly so that you can follow the rest of the examples and descriptions in this book.
Copy file name to clipboardExpand all lines: book/01-introduction/sections/installing.asc
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -31,7 +31,7 @@ $ sudo apt install git-all
31
31
32
32
For more options, there are instructions for installing on several different Unix distributions on the Git website, at http://git-scm.com/download/linux[].
Copy file name to clipboardExpand all lines: book/A-git-in-other-environments/sections/guis.asc
+5-5Lines changed: 5 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -69,7 +69,7 @@ Each of them is tailored for a specific purpose (viewing history and creating co
69
69
==== GitHub for Mac and Windows
70
70
71
71
(((GitHub for Mac)))(((GitHub for Windows)))
72
-
GitHub has created two workflow-oriented Git clients: one for Windows, and one for Mac.
72
+
GitHub has created two workflow-oriented Git clients: one for Windows, and one for macOS.
73
73
These clients are a good example of workflow-oriented tools – rather than expose _all_ of Git's functionality, they instead focus on a curated set of commonly-used features that work well together.
74
74
They look like this:
75
75
@@ -84,7 +84,7 @@ We won't be doing a detailed rundown of these tools (they have their own documen
84
84
85
85
* On the left is the list of repositories the client is tracking; you can add a repository (either by cloning or attaching locally) by clicking the ``+'' icon at the top of this area.
86
86
* In the center is a commit-input area, which lets you input a commit message, and select which files should be included.
87
-
(On Windows, the commit history is displayed directly below this; on Mac, it's on a separate tab.)
87
+
(On Windows, the commit history is displayed directly below this; on macOS, it's on a separate tab.)
88
88
* On the right is a diff view, which shows what's changed in your working directory, or which changes were included in the selected commit.
89
89
* The last thing to notice is the ``Sync'' button at the top-right, which is the primary way you interact over the network.
90
90
@@ -114,10 +114,10 @@ The intended workflow for this tool is sometimes called the ``GitHub Flow.''
114
114
We cover this in more detail in <<ch06-github#ch06-github_flow>>, but the general gist is that (a) you'll be committing to a branch, and (b) you'll be syncing up with a remote repository fairly regularly.
115
115
116
116
Branch management is one of the areas where the two tools diverge.
117
-
On Mac, there's a button at the top of the window for creating a new branch:
117
+
On macOS, there's a button at the top of the window for creating a new branch:
118
118
119
-
.``Create Branch'' button on Mac.
120
-
image::images/branch_widget_mac.png[``Create Branch'' button on Mac.]
119
+
.``Create Branch'' button on macOS.
120
+
image::images/branch_widget_mac.png[``Create Branch'' button on macOS.]
121
121
122
122
On Windows, this is done by typing the new branch's name in the branch-switching widget:
0 commit comments