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
Copy file name to clipboardExpand all lines: book/C-git-commands/1-git-commands.asc
+2-4Lines changed: 2 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -218,7 +218,7 @@ In <<_private_team>> and <<_commit_ranges>> we cover the `branchA..branchB` synt
218
218
219
219
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.
220
220
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.
222
222
223
223
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.
224
224
@@ -253,7 +253,7 @@ We also use it in several of the examples in <<_contributing_project>>.
253
253
254
254
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>>.
255
255
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>>.
257
257
258
258
==== git pull
259
259
@@ -277,8 +277,6 @@ Throughout <<_contributing_project>> we see several examples of using `git push`
277
277
278
278
We see how to use it to share tags that you have made with the `--tags` option in <<_sharing_tags>>.
279
279
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
-
282
280
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.
283
281
284
282
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.
0 commit comments