Permalink
Browse files

Prefer less markup

  • Loading branch information...
1 parent 2b32865 commit 39327a4dc76cd14680aeeea1b3122574a1cbdbf8 @simeonwillbanks simeonwillbanks committed Jan 11, 2014
Showing with 29 additions and 58 deletions.
  1. +10 −20 basic/index.html
  2. +8 −16 branching/index.html
  3. +6 −12 inspect/index.html
  4. +5 −10 remotes/index.html
View
@@ -265,8 +265,7 @@
a good follow-up command to <code>git status</code>
</p>
- <h4>
- <a name="diff-cached"></a>
+ <h4 id="diff-cached">
git diff --cached
<small>show diff of staged changes</small>
</h4>
@@ -313,8 +312,7 @@
end
</pre>
- <h4>
- <a name="diff-head"></a>
+ <h4 id="diff-head">
git diff HEAD
<small>show diff of all staged or unstaged changes</small>
</h4>
@@ -373,8 +371,7 @@
end
</pre>
- <h4>
- <a name="diff-stat"></a>
+ <h4 id="diff-stat">
git diff --stat
<small>show summary of changes instead of a full diff</small>
</h4>
@@ -538,8 +535,7 @@
separate change in a separate commit with a nice commit message so it
is easier for them to see what you are doing and why.</p>
- <h4>
- <a name="commit-a"></a>
+ <h4 id="commit-a">
git commit -a
<small>automatically stage all tracked, modified files before the commit</small>
</h4>
@@ -614,8 +610,7 @@
helpful.
</p>
- <h4>
- <a name="reset-head"></a>
+ <h4 id="reset-head">
git reset HEAD
<small>unstage files from index and reset pointer to HEAD</small>
</h4>
@@ -694,8 +689,7 @@
it defaults to <code>--mixed</code>. The other options are
<code>--soft</code> and <code>--hard</code>.</p>
- <h4>
- <a name="reset-soft"></a>
+ <h4 id="reset-soft">
git reset --soft
<small>moves HEAD to specified commit reference, index and staging are untouched</small>
</h4>
@@ -725,8 +719,7 @@
<code>git commit --amend</code>, allowing you to do more work
before you roll in the file changes into the same commit.</p>
- <h4>
- <a name="reset-hard"></a>
+ <h4 id="reset-hard">
git reset --hard
<small>unstage files AND undo any changes in the working directory since last commit</small>
</h4>
@@ -875,8 +868,7 @@
nothing to commit (working directory clean)
</pre>
- <h4>
- <a name="stash-list"></a>
+ <h4 id="stash-list">
git stash list
<small>view stashes currently on the stack</small>
</h4>
@@ -909,8 +901,7 @@
stash@{1}: WIP on master: 5857ac1 hello with a flower
</pre>
- <h4>
- <a name="stash-apply"></a>
+ <h4 id="stash-apply">
git stash apply
<small>grab the item from the stash list and apply to current working directory</small>
</h4>
@@ -943,8 +934,7 @@
use <code>git stash pop</code> instead.
</p>
- <h4>
- <a name="stash-drop"></a>
+ <h4 id="stash-drop">
git stash drop
<small>remove an item from the stash list</small>
</h4>
View
@@ -64,8 +64,7 @@
switches you between your branches.
</p>
- <h4>
- <a name="branch-list"></a>
+ <h4 id="branch-list">
git branch
<small>list your available branches</small>
</h4>
@@ -89,8 +88,7 @@
that is created, most projects do.
</p>
- <h4>
- <a name="branch-create"></a>
+ <h4 id="branch-create">
git branch (branchname)
<small>create a new branch</small>
</h4>
@@ -147,8 +145,7 @@
README hello.rb more.txt test.txt
</pre>
- <h4>
- <a name="branch-last-commit"></a>
+ <h4 id="branch-last-commit">
git branch -v
<small>see the last commit on each branch</small>
</h4>
@@ -163,8 +160,7 @@
testing 62a557a update test scripts
</pre>
- <h4>
- <a name="branch-create-switch"></a>
+ <h4 id="branch-create-switch">
git checkout -b (branchname)
<small>create and immediately switch to a branch</small>
</h4>
@@ -215,8 +211,7 @@
to switch back to a more stable context your work in progress is easy to put
aside and then come back to.</p>
- <h4>
- <a name="branch-delete"></a>
+ <h4 id="branch-delete">
git branch -d (branchname)
<small>delete a branch</small>
</h4>
@@ -235,8 +230,7 @@
* <span class="green">master</span>
</pre>
- <h4>
- <a name="branch-delete-remote"></a>
+ <h4 id="branch-delete-remote">
git push (remote-name) :(branchname)
<small>delete a remote branch</small>
</h4>
@@ -315,8 +309,7 @@
<span class="hl">README hello.rb</span>
</pre>
- <h4>
- <a name="merge-complex"></a>
+ <h4 id="merge-complex">
more complex merges
</h4>
@@ -417,8 +410,7 @@
and the file that had been renamed now has the 'HiWorld' class name change
that was done in the other branch. Pretty cool.</p>
- <h4>
- <a name="merge-conflicts"></a>
+ <h4 id="merge-conflicts">
merge conflicts
</h4>
View
@@ -47,8 +47,7 @@
list.
</p>
- <h4>
- <a name="log-author"></a>
+ <h4 id="log-author">
git log --author
<small>look for only commits from a specific author</small>
</h4>
@@ -72,8 +71,7 @@
112dd51 make "mktag" a built-in
</pre>
- <h4>
- <a name="log-date"></a>
+ <h4 id="log-date">
git log --since --before
<small>filter commits by date committed</small>
</h4>
@@ -100,8 +98,7 @@
636db2c t3301: add tests to use --format="%N"
</pre>
- <h4>
- <a name="log-grep"></a>
+ <h4 id="log-grep">
git log --grep
<small>filter commits by commit message</small>
</h4>
@@ -178,8 +175,7 @@
1cd5738 Simon Hausmann Make incremental imports easier to use by storing the p4 d
</pre>
- <h4>
- <a name="log-s"></a>
+ <h4 id="log-s">
git log -S
<small>filter by introduced diff</small>
</h4>
@@ -214,8 +210,7 @@
Signed-off-by: Junio C Hamano
</pre>
- <h4>
- <a name="log-patch"></a>
+ <h4 id="log-patch">
git log -p
<small>show patch introduced at each commit</small>
</h4>
@@ -275,8 +270,7 @@
<p>This is a really nice way of summarizing changes or reviewing a series
of commits before merging them or releasing something.</p>
- <h4>
- <a name="log-stat"></a>
+ <h4 id="log-stat">
git log --stat
<small>show diffstat of changes introduced at each commit</small>
</h4>
View
@@ -64,8 +64,7 @@
<code>git remote</code> command to manage this list of remote repos that
you care about.</p>
- <h4>
- <a name="remote-list"></a>
+ <h4 id="remote-list">
git remote
<small>list your remote aliases</small>
</h4>
@@ -89,8 +88,7 @@
push and fetch URLs for each remote in case you want to use different
protocols for reads and writes.</p>
- <h4>
- <a name="remote-add"></a>
+ <h4 id="remote-add">
git remote add
<small>add a new remote repository of your project</small>
</h4>
@@ -123,8 +121,7 @@
about anything.
</p>
- <h4>
- <a name="remote-remove"></a>
+ <h4 id="remote-remove">
git remote rm
<small>removing an existing remote alias</small>
</h4>
@@ -149,8 +146,7 @@
github git@github.com:schacon/hw.git (push)
</pre>
- <h4>
- <a name="remote-rename"></a>
+ <h4 id="remote-rename">
git remote rename [old-alias] [new-alias]
<small>rename remote aliases</small>
</h4>
@@ -177,8 +173,7 @@
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.
</p>
- <h4>
- <a name="remote-update"></a>
+ <h4 id="remote-update">
git remote set-url
<small>update an existing remote URL</small>
</h4>

0 comments on commit 39327a4

Please sign in to comment.