From bff3bf6d83415e698f3e2bddaaa2122e0852b12d Mon Sep 17 00:00:00 2001 From: Kenneth Kin Lum Date: Sat, 27 Feb 2016 05:13:21 -0800 Subject: [PATCH 1/6] fixed to be more precise --- book/08-customizing-git/sections/config.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/08-customizing-git/sections/config.asc b/book/08-customizing-git/sections/config.asc index 80407cf7d..453358cdd 100644 --- a/book/08-customizing-git/sections/config.asc +++ b/book/08-customizing-git/sections/config.asc @@ -145,7 +145,7 @@ You can put patterns in your project's `.gitignore` file to have Git not see the But sometimes you want to ignore certain files for all repositories that you work with. If your computer is running Mac OS X, you're probably familiar with `.DS_Store` files. -If your preferred editor is Emacs or Vim, you know about files that end with a `~` or `.swp`. +If your preferred editor is Emacs or Vim, you know about files that end with a `~` or `.swp` in the filename. This setting lets you write a kind of global `.gitignore` file. If you create a `~/.gitignore_global` file with these contents: From 7b8059fd14a0ecbcbc8824b20f7dafefcdcc2f28 Mon Sep 17 00:00:00 2001 From: Kenneth Kin Lum Date: Sat, 27 Feb 2016 05:19:30 -0800 Subject: [PATCH 2/6] fixed to be more precise --- book/02-git-basics/sections/recording-changes.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/02-git-basics/sections/recording-changes.asc b/book/02-git-basics/sections/recording-changes.asc index 53de94044..558ec65eb 100644 --- a/book/02-git-basics/sections/recording-changes.asc +++ b/book/02-git-basics/sections/recording-changes.asc @@ -204,7 +204,7 @@ $ cat .gitignore ---- The first line tells Git to ignore any files ending in ``.o'' or ``.a'' – object and archive files that may be the product of building your code. -The second line tells Git to ignore all files that end with a tilde (`~`), which is used by many text editors such as Emacs to mark temporary files. +The second line tells Git to ignore all files that end with a tilde (`~`) in the filename, which is used by many text editors such as Emacs to mark temporary files. You may also include a log, tmp, or pid directory; automatically generated documentation; and so on. Setting up a `.gitignore` file before you get going is generally a good idea so you don't accidentally commit files that you really don't want in your Git repository. From 288914191cb2376e9c35d262c3d8268d76d78a46 Mon Sep 17 00:00:00 2001 From: Kenneth Kin Lum Date: Sat, 27 Feb 2016 05:22:37 -0800 Subject: [PATCH 3/6] fixed to be more precise --- book/02-git-basics/sections/recording-changes.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/02-git-basics/sections/recording-changes.asc b/book/02-git-basics/sections/recording-changes.asc index 558ec65eb..1a4f64392 100644 --- a/book/02-git-basics/sections/recording-changes.asc +++ b/book/02-git-basics/sections/recording-changes.asc @@ -539,7 +539,7 @@ Or, you can do something like this: $ git rm \*~ ---- -This command removes all files that end with `~`. +This command removes all files that end with a `~` in the filename. [[_git_mv]] ==== Moving Files From 670e1cc02fe978c971b3264d31f045f1b68ba230 Mon Sep 17 00:00:00 2001 From: Kenneth Kin Lum Date: Sat, 27 Feb 2016 07:36:41 -0800 Subject: [PATCH 4/6] more idiomatic --- book/02-git-basics/sections/recording-changes.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/02-git-basics/sections/recording-changes.asc b/book/02-git-basics/sections/recording-changes.asc index 1a4f64392..dffd9b7cf 100644 --- a/book/02-git-basics/sections/recording-changes.asc +++ b/book/02-git-basics/sections/recording-changes.asc @@ -204,7 +204,7 @@ $ cat .gitignore ---- The first line tells Git to ignore any files ending in ``.o'' or ``.a'' – object and archive files that may be the product of building your code. -The second line tells Git to ignore all files that end with a tilde (`~`) in the filename, which is used by many text editors such as Emacs to mark temporary files. +The second line tells Git to ignore all files whose names end with a tilde (`~`), which is used by many text editors such as Emacs to mark temporary files. You may also include a log, tmp, or pid directory; automatically generated documentation; and so on. Setting up a `.gitignore` file before you get going is generally a good idea so you don't accidentally commit files that you really don't want in your Git repository. From b2d82d58cd961deeb04372c2e736e1db7cef3beb Mon Sep 17 00:00:00 2001 From: Kenneth Kin Lum Date: Sat, 27 Feb 2016 16:28:52 -0800 Subject: [PATCH 5/6] more idiomatic --- book/02-git-basics/sections/recording-changes.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/02-git-basics/sections/recording-changes.asc b/book/02-git-basics/sections/recording-changes.asc index dffd9b7cf..0377a8631 100644 --- a/book/02-git-basics/sections/recording-changes.asc +++ b/book/02-git-basics/sections/recording-changes.asc @@ -539,7 +539,7 @@ Or, you can do something like this: $ git rm \*~ ---- -This command removes all files that end with a `~` in the filename. +This command removes all files whose names end with a `~`. [[_git_mv]] ==== Moving Files From 2e8943548caec5000b71bc0b70f54c1592e91af6 Mon Sep 17 00:00:00 2001 From: Kenneth Kin Lum Date: Sat, 27 Feb 2016 16:30:32 -0800 Subject: [PATCH 6/6] more idiomatic --- book/08-customizing-git/sections/config.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/08-customizing-git/sections/config.asc b/book/08-customizing-git/sections/config.asc index 453358cdd..acbb7972c 100644 --- a/book/08-customizing-git/sections/config.asc +++ b/book/08-customizing-git/sections/config.asc @@ -145,7 +145,7 @@ You can put patterns in your project's `.gitignore` file to have Git not see the But sometimes you want to ignore certain files for all repositories that you work with. If your computer is running Mac OS X, you're probably familiar with `.DS_Store` files. -If your preferred editor is Emacs or Vim, you know about files that end with a `~` or `.swp` in the filename. +If your preferred editor is Emacs or Vim, you know about filenames that end with a `~` or `.swp`. This setting lets you write a kind of global `.gitignore` file. If you create a `~/.gitignore_global` file with these contents: