Skip to content

Commit ac2aca9

Browse files
committed
Merge pull request #33 from schacon/chapter-3-updates
Chapter 3 updates
2 parents ca70a65 + ad02690 commit ac2aca9

File tree

8 files changed

+14788
-5443
lines changed

8 files changed

+14788
-5443
lines changed

en/book/02-git-basics/chapter2.asc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,10 +769,12 @@ image::images/18333fig0202-tn.png[The gitk history visualizer.]
769769

770770
You can see the commit history in the top half of the window along with a nice ancestry graph. The diff viewer in the bottom half of the window shows you the changes introduced at any commit you click.
771771

772+
[[_undoing]]
772773
=== Undoing Things
773774

774775
At any stage, you may want to undo something. Here, we’ll review a few basic tools for undoing changes that you’ve made. Be careful, because you can’t always undo some of these undos. This is one of the few areas in Git where you may lose some work if you do it wrong.
775776

777+
[[_reset]]
776778
==== Reset Demystified
777779

778780
**TODO**

en/book/03-git-branching/chapter3.asc

Lines changed: 519 additions & 281 deletions
Large diffs are not rendered by default.

en/book/images/undomerge-reset.png

52 KB
Loading
54 KB
Loading
63.4 KB
Loading
68.6 KB
Loading

en/book/images/undomerge-start.png

48.8 KB
Loading

0 commit comments

Comments
 (0)