diff options
author | Simeon F. Willbanks <sfw@simeonfosterwillbanks.com> | 2014-01-11 04:09:58 +0400 |
---|---|---|
committer | Simeon F. Willbanks <sfw@simeonfosterwillbanks.com> | 2014-01-11 04:09:58 +0400 |
commit | 39327a4dc76cd14680aeeea1b3122574a1cbdbf8 (patch) | |
tree | 1660649594a6d9b588204d46c84399a5cf7d0981 | |
parent | 2b328650e926e9915f49e5afa35a99ec9a59e62d (diff) |
Prefer less markup
-rw-r--r-- | basic/index.html | 30 | ||||
-rw-r--r-- | branching/index.html | 24 | ||||
-rw-r--r-- | inspect/index.html | 18 | ||||
-rw-r--r-- | remotes/index.html | 15 |
4 files changed, 29 insertions, 58 deletions
diff --git a/basic/index.html b/basic/index.html index bfaa278..b381b86 100644 --- a/basic/index.html +++ b/basic/index.html @@ -265,8 +265,7 @@ index d62ac43..8d15d50 100644 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 @@ index d62ac43..8d15d50 100644 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 @@ index 2aabb6e..2ae9ba4 100644 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 @@ Further paragraphs come after blank lines. 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 @@ Further paragraphs come after blank lines. 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 @@ M hello.rb 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 @@ nothing to commit (working directory clean) <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 @@ HEAD is now at 5857ac1 hello with a flower 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@{0}: WIP on master: ee2d2c6 it stops raining 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 @@ no changes added to commit (use "git add" and/or "git commit -a") 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> diff --git a/branching/index.html b/branching/index.html index ffa413c..96112be 100644 --- a/branching/index.html +++ b/branching/index.html @@ -64,8 +64,7 @@ layout: reference 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 @@ $ git branch 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 @@ Switched to branch 'master' 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 @@ README hello.rb more.txt test.txt 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 @@ README hello.rb more.txt test.txt 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 @@ Deleted branch testing (was 78b2670). * <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 @@ Fast-forward <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 @@ HiWorld.hello 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> diff --git a/inspect/index.html b/inspect/index.html index 152b4bf..32945eb 100644 --- a/inspect/index.html +++ b/inspect/index.html @@ -47,8 +47,7 @@ layout: reference 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 @@ b532581 make "git unpack-file" a built-in 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 @@ b6c8d2d Documentation/remote-helpers: Add invocation section 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 @@ e96e400 Simon Hausmann git-p4: Fix submit user-interface. 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 @@ Date: Tue Apr 13 22:31:12 2010 +0200 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 @@ index d053cc8..9103e27 100644 <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> diff --git a/remotes/index.html b/remotes/index.html index 27a2f84..94df417 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -64,8 +64,7 @@ layout: reference <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 @@ origin git@github.com:github/git-reference.git (push) 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 @@ github git@github.com:schacon/hw.git (push) 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 (fetch) 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 @@ origin git@github.com:schacon/hw.git (push) 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> |