Skip to content

Commit f2a9e1b

Browse files
committed
Outline adjustments reflected in asciidoc
1 parent 36e5286 commit f2a9e1b

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

book/03-git-branching/1-git-branching.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -776,9 +776,9 @@ Switched to a new branch 'serverfix'
776776

777777
This gives you a local branch that you can work on that starts where `origin/serverfix` is.
778778

779-
==== Tracking Branches
779+
==== Tracking/Upstream Branches
780780

781-
Checking out a local branch from a remote branch automatically creates what is called a _tracking branch_.
781+
Checking out a local branch from a remote branch automatically creates what is called a ``tracking branch'' (or sometimes an ``upstream branch'').
782782
Tracking branches are local branches that have a direct relationship to a remote branch.
783783
If you’re on a tracking branch and type `git push`, Git automatically knows which server and branch to push to.
784784
Also, running `git pull` while on one of these branches fetches all the remote references and then automatically merges in the corresponding remote branch.

book/07-git-tools/1-git-tools.asc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ At this point, you can exit the interactive adding script and run `git commit` t
464464

465465
Finally, you don’t need to be in interactive add mode to do the partial-file staging – you can start the same script by using `git add -p` or `git add --patch` on the command line.
466466

467-
=== Stashing
467+
=== Stashing and Cleaning
468468

469469
Often, when you’ve been working on part of your project, things are in a messy state and you want to switch branches for a bit to work on something else.
470470
The problem is, you don’t want to do a commit of half-done work just so you can get back to this point later.
@@ -603,8 +603,16 @@ If you want an easier way to test the stashed changes again, you can run `git st
603603

604604
This is a nice shortcut to recover stashed work easily and work on it in a new branch.
605605

606+
==== Cleaning your Working Directory
607+
606608
=== Searching
607609

610+
=== Interactive Staging
611+
612+
==== Staging and Unstaging Files
613+
614+
==== Staging Patches
615+
608616
=== Rewriting History
609617

610618
Many times, when working with Git, you may want to revise your commit history for some reason.

0 commit comments

Comments
 (0)