Prefer less markup
Simeon F. Willbanks committed
Jan 10, 2014 at 16:09 UTC
39327a4dc76cd14680aeeea1b3122574a1cbdbf8
4 files changed
+29
-58
basic/index.html
+10
-20
@@ -265,8 +265,7 @@ index d62ac43..8d15d50 100644
265
a good follow-up command to <code>git status</code>
266
</p>
267
268
- <h4>
269
- <a name="diff-cached"></a>
268
+ <h4 id="diff-cached">
269
git diff --cached
270
<small>show diff of staged changes</small>
271
</h4>
@@ -313,8 +312,7 @@ index d62ac43..8d15d50 100644
312
end
313
</pre>
314
316
- <h4>
317
- <a name="diff-head"></a>
315
+ <h4 id="diff-head">
316
git diff HEAD
317
<small>show diff of all staged or unstaged changes</small>
318
</h4>
@@ -373,8 +371,7 @@ index 2aabb6e..2ae9ba4 100644
371
end
372
</pre>
373
376
- <h4>
377
- <a name="diff-stat"></a>
374
+ <h4 id="diff-stat">
375
git diff --stat
376
<small>show summary of changes instead of a full diff</small>
377
</h4>
@@ -538,8 +535,7 @@ Further paragraphs come after blank lines.
535
separate change in a separate commit with a nice commit message so it
536
is easier for them to see what you are doing and why.</p>
537
541
- <h4>
542
- <a name="commit-a"></a>
538
+ <h4 id="commit-a">
539
git commit -a
540
<small>automatically stage all tracked, modified files before the commit</small>
541
</h4>
@@ -614,8 +610,7 @@ Further paragraphs come after blank lines.
610
helpful.
611
</p>
612
617
- <h4>
618
- <a name="reset-head"></a>
613
+ <h4 id="reset-head">
614
git reset HEAD
615
<small>unstage files from index and reset pointer to HEAD</small>
616
</h4>
@@ -694,8 +689,7 @@ M hello.rb
689
it defaults to <code>--mixed</code>. The other options are
690
<code>--soft</code> and <code>--hard</code>.</p>
691
697
- <h4>
698
- <a name="reset-soft"></a>
692
+ <h4 id="reset-soft">
693
git reset --soft
694
<small>moves HEAD to specified commit reference, index and staging are untouched</small>
695
</h4>
@@ -725,8 +719,7 @@ nothing to commit (working directory clean)
719
<code>git commit --amend</code>, allowing you to do more work
720
before you roll in the file changes into the same commit.</p>
721
728
- <h4>
729
- <a name="reset-hard"></a>
722
+ <h4 id="reset-hard">
723
git reset --hard
724
<small>unstage files AND undo any changes in the working directory since last commit</small>
725
</h4>
@@ -875,8 +868,7 @@ HEAD is now at 5857ac1 hello with a flower
868
nothing to commit (working directory clean)
869
</pre>
870
878
- <h4>
879
- <a name="stash-list"></a>
871
+ <h4 id="stash-list">
872
git stash list
873
<small>view stashes currently on the stack</small>
874
</h4>
@@ -909,8 +901,7 @@ stash@{0}: WIP on master: ee2d2c6 it stops raining
901
stash@{1}: WIP on master: 5857ac1 hello with a flower
902
</pre>
903
912
- <h4>
913
- <a name="stash-apply"></a>
904
+ <h4 id="stash-apply">
905
git stash apply
906
<small>grab the item from the stash list and apply to current working directory</small>
907
</h4>
@@ -943,8 +934,7 @@ no changes added to commit (use "git add" and/or "git commit -a")
934
use <code>git stash pop</code> instead.
935
</p>
936
946
- <h4>
947
- <a name="stash-drop"></a>
937
+ <h4 id="stash-drop">
938
git stash drop
939
<small>remove an item from the stash list</small>
940
</h4>
branching/index.html
+8
-16
@@ -64,8 +64,7 @@ layout: reference
64
switches you between your branches.
65
</p>
66
67
- <h4>
68
- <a name="branch-list"></a>
67
+ <h4 id="branch-list">
68
git branch
69
<small>list your available branches</small>
70
</h4>
@@ -89,8 +88,7 @@ $ git branch
88
that is created, most projects do.
89
</p>
90
92
- <h4>
93
- <a name="branch-create"></a>
91
+ <h4 id="branch-create">
92
git branch (branchname)
93
<small>create a new branch</small>
94
</h4>
@@ -147,8 +145,7 @@ Switched to branch 'master'
145
README hello.rb more.txt test.txt
146
</pre>
147
150
- <h4>
151
- <a name="branch-last-commit"></a>
148
+ <h4 id="branch-last-commit">
149
git branch -v
150
<small>see the last commit on each branch</small>
151
</h4>
@@ -163,8 +160,7 @@ README hello.rb more.txt test.txt
160
testing 62a557a update test scripts
161
</pre>
162
166
- <h4>
167
- <a name="branch-create-switch"></a>
163
+ <h4 id="branch-create-switch">
164
git checkout -b (branchname)
165
<small>create and immediately switch to a branch</small>
166
</h4>
@@ -215,8 +211,7 @@ README hello.rb more.txt test.txt
211
to switch back to a more stable context your work in progress is easy to put
212
aside and then come back to.</p>
213
218
- <h4>
219
- <a name="branch-delete"></a>
214
+ <h4 id="branch-delete">
215
git branch -d (branchname)
216
<small>delete a branch</small>
217
</h4>
@@ -235,8 +230,7 @@ Deleted branch testing (was 78b2670).
230
* <span class="green">master</span>
231
</pre>
232
238
- <h4>
239
- <a name="branch-delete-remote"></a>
233
+ <h4 id="branch-delete-remote">
234
git push (remote-name) :(branchname)
235
<small>delete a remote branch</small>
236
</h4>
@@ -315,8 +309,7 @@ Fast-forward
309
<span class="hl">README hello.rb</span>
310
</pre>
311
318
- <h4>
319
- <a name="merge-complex"></a>
312
+ <h4 id="merge-complex">
313
more complex merges
314
</h4>
315
@@ -417,8 +410,7 @@ HiWorld.hello
410
and the file that had been renamed now has the 'HiWorld' class name change
411
that was done in the other branch. Pretty cool.</p>
412
420
- <h4>
421
- <a name="merge-conflicts"></a>
413
+ <h4 id="merge-conflicts">
414
merge conflicts
415
</h4>
416
inspect/index.html
+6
-12
@@ -47,8 +47,7 @@ layout: reference
47
list.
48
</p>
49
50
- <h4>
51
- <a name="log-author"></a>
50
+ <h4 id="log-author">
51
git log --author
52
<small>look for only commits from a specific author</small>
53
</h4>
@@ -72,8 +71,7 @@ b532581 make "git unpack-file" a built-in
71
112dd51 make "mktag" a built-in
72
</pre>
73
75
- <h4>
76
- <a name="log-date"></a>
74
+ <h4 id="log-date">
75
git log --since --before
76
<small>filter commits by date committed</small>
77
</h4>
@@ -100,8 +98,7 @@ b6c8d2d Documentation/remote-helpers: Add invocation section
98
636db2c t3301: add tests to use --format="%N"
99
</pre>
100
103
- <h4>
104
- <a name="log-grep"></a>
101
+ <h4 id="log-grep">
102
git log --grep
103
<small>filter commits by commit message</small>
104
</h4>
@@ -178,8 +175,7 @@ e96e400 Simon Hausmann git-p4: Fix submit user-interface.
175
1cd5738 Simon Hausmann Make incremental imports easier to use by storing the p4 d
176
</pre>
177
181
- <h4>
182
- <a name="log-s"></a>
178
+ <h4 id="log-s">
179
git log -S
180
<small>filter by introduced diff</small>
181
</h4>
@@ -214,8 +210,7 @@ Date: Tue Apr 13 22:31:12 2010 +0200
210
Signed-off-by: Junio C Hamano
211
</pre>
212
217
- <h4>
218
- <a name="log-patch"></a>
213
+ <h4 id="log-patch">
214
git log -p
215
<small>show patch introduced at each commit</small>
216
</h4>
@@ -275,8 +270,7 @@ index d053cc8..9103e27 100644
270
<p>This is a really nice way of summarizing changes or reviewing a series
271
of commits before merging them or releasing something.</p>
272
278
- <h4>
279
- <a name="log-stat"></a>
273
+ <h4 id="log-stat">
274
git log --stat
275
<small>show diffstat of changes introduced at each commit</small>
276
</h4>
remotes/index.html
+5
-10
@@ -64,8 +64,7 @@ layout: reference
64
<code>git remote</code> command to manage this list of remote repos that
65
you care about.</p>
66
67
- <h4>
68
- <a name="remote-list"></a>
67
+ <h4 id="remote-list">
68
git remote
69
<small>list your remote aliases</small>
70
</h4>
@@ -89,8 +88,7 @@ origin git@github.com:github/git-reference.git (push)
88
push and fetch URLs for each remote in case you want to use different
89
protocols for reads and writes.</p>
90
92
- <h4>
93
- <a name="remote-add"></a>
91
+ <h4 id="remote-add">
92
git remote add
93
<small>add a new remote repository of your project</small>
94
</h4>
@@ -123,8 +121,7 @@ github git@github.com:schacon/hw.git (push)
121
about anything.
122
</p>
123
126
- <h4>
127
- <a name="remote-remove"></a>
124
+ <h4 id="remote-remove">
125
git remote rm
126
<small>removing an existing remote alias</small>
127
</h4>
@@ -149,8 +146,7 @@ github git@github.com:schacon/hw.git (fetch)
146
github git@github.com:schacon/hw.git (push)
147
</pre>
148
152
- <h4>
153
- <a name="remote-rename"></a>
149
+ <h4 id="remote-rename">
150
git remote rename [old-alias] [new-alias]
151
<small>rename remote aliases</small>
152
</h4>
@@ -177,8 +173,7 @@ origin git@github.com:schacon/hw.git (push)
173
add new remotes, <code>git remote rm</code> to delete existing ones or <code>git remote rename [old-alias] [new-alias]</code> to rename them.
174
</p>
175
180
- <h4>
181
- <a name="remote-update"></a>
176
+ <h4 id="remote-update">
177
git remote set-url
178
<small>update an existing remote URL</small>
179
</h4>