Skip to content

Commit 9ab7615

Browse files
committed
Merge pull request #163 from progit/remove-notes
Remove dead notes content
2 parents 1c03a04 + e2af0d7 commit 9ab7615

File tree

3 files changed

+2
-263
lines changed

3 files changed

+2
-263
lines changed

book/07-git-tools/sections/notes.asc

Lines changed: 0 additions & 258 deletions
This file was deleted.

book/C-git-commands/1-git-commands.asc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ In <<_private_team>> and <<_commit_ranges>> we cover the `branchA..branchB` synt
218218

219219
In <<_merge_log>> and <<_triple_dot>> we cover using the `branchA...branchB` format and the `--left-right` syntax to see what is in one branch or the other but not in both. In <<_merge_log>> we also look at how to use the `--merge` option to help with merge conflict debugging as well as using the `--cc` option to look at merge commit conflicts in your history.
220220

221-
In <<_git_notes>> we use the `--notes=` option to display notes inline in the log output, and in <<_git_reflog>> we use the `-g` option to view the Git reflog through this tool instead of doing branch traversal.
221+
In <<_git_reflog>> we use the `-g` option to view the Git reflog through this tool instead of doing branch traversal.
222222

223223
In <<_searching>> we look at using the `-S` and `-L` options to do fairly sophisticated searches for something that happened historically in the code such as seeing the history of a function.
224224

@@ -253,7 +253,7 @@ We also use it in several of the examples in <<_contributing_project>>.
253253

254254
We use it to fetch a single specific reference that is outside of the default space in <<_pr_refs>> and we see how to fetch from a bundle in <<_bundling>>.
255255

256-
We set up highly custom refspecs in order to make `git fetch` do something a little different than the default in <<_getting_notes>> and <<_refspec>>.
256+
We set up highly custom refspecs in order to make `git fetch` do something a little different than the default in <<_refspec>>.
257257

258258
==== git pull
259259

@@ -277,8 +277,6 @@ Throughout <<_contributing_project>> we see several examples of using `git push`
277277

278278
We see how to use it to share tags that you have made with the `--tags` option in <<_sharing_tags>>.
279279

280-
In <<_sharing_notes>> we use it in a slightly less common way to share references for commit notes -- references that sit outside of the normal refs namespace.
281-
282280
In <<_publishing_submodules>> we use the `--recurse-submodules` option to check that all of our submodules work has been published before pushing the superproject, which can be really helpful when using submodules.
283281

284282
In <<_other_client_hooks>> we talk briefly about the `pre-push` hook, which is a script we can setup to run before a push completes to verify that it should be allowed to push.

status.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"sections/credentials.asc": 0,
6666
"sections/debugging.asc": 0,
6767
"sections/interactive-staging.asc": 0,
68-
"sections/notes.asc": 0,
6968
"sections/replace.asc": 0,
7069
"sections/rerere.asc": 0,
7170
"sections/reset.asc": 0,

0 commit comments

Comments
 (0)