diff options
Diffstat (limited to 'branching/index.html')
| -rw-r--r-- | branching/index.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/branching/index.html b/branching/index.html index 27fd588..96112be 100644 --- a/branching/index.html +++ b/branching/index.html @@ -64,7 +64,7 @@ layout: reference switches you between your branches. </p> - <h4> + <h4 id="branch-list"> git branch <small>list your available branches</small> </h4> @@ -88,7 +88,7 @@ $ git branch that is created, most projects do. </p> - <h4> + <h4 id="branch-create"> git branch (branchname) <small>create a new branch</small> </h4> @@ -145,7 +145,7 @@ Switched to branch 'master' README hello.rb more.txt test.txt </pre> - <h4> + <h4 id="branch-last-commit"> git branch -v <small>see the last commit on each branch</small> </h4> @@ -160,7 +160,7 @@ README hello.rb more.txt test.txt testing 62a557a update test scripts </pre> - <h4> + <h4 id="branch-create-switch"> git checkout -b (branchname) <small>create and immediately switch to a branch</small> </h4> @@ -211,7 +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> + <h4 id="branch-delete"> git branch -d (branchname) <small>delete a branch</small> </h4> @@ -230,7 +230,7 @@ Deleted branch testing (was 78b2670). * <span class="green">master</span> </pre> - <h4> + <h4 id="branch-delete-remote"> git push (remote-name) :(branchname) <small>delete a remote branch</small> </h4> @@ -309,7 +309,7 @@ Fast-forward <span class="hl">README hello.rb</span> </pre> - <h4> + <h4 id="merge-complex"> more complex merges </h4> @@ -410,7 +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> + <h4 id="merge-conflicts"> merge conflicts </h4> |