summaryrefslogtreecommitdiffhomepage
path: root/git.html.markdown
diff options
context:
space:
mode:
authorBoris Verkhovskiy <boris.verk@gmail.com>2024-04-06 08:33:50 -0700
committerBoris Verkhovskiy <boris.verk@gmail.com>2024-04-06 08:33:50 -0700
commit3e687f1a8ccb1cd0d52a966005551d528ca141df (patch)
tree30d433ba19ec49808cc0f0de8a161835ad5f29c9 /git.html.markdown
parent9fa4b5af80f1cd7fe2469c198d02a21e4f8884a1 (diff)
Remove leading and trailing empty lines in code blocks
Diffstat (limited to 'git.html.markdown')
-rw-r--r--git.html.markdown3
1 files changed, 3 insertions, 0 deletions
diff --git a/git.html.markdown b/git.html.markdown
index 9d33225f..dc84e5e7 100644
--- a/git.html.markdown
+++ b/git.html.markdown
@@ -456,6 +456,7 @@ Now you can pull!
```bash
git pull
```
+
`...changes apply...`
Now check that everything is OK
@@ -553,6 +554,7 @@ You can do this:
ed8ddf2 HEAD@{4}: rebase -i (pick): pythonstatcomp spanish translation (#1748)
2e6c386 HEAD@{5}: rebase -i (start): checkout 02fb96d
```
+
2. Select where to reset to, in our case its `2e6c386`, or `HEAD@{5}`
3. 'git reset --hard HEAD@{5}' this will reset your repo to that head
4. You can start the rebase again or leave it alone.
@@ -595,6 +597,7 @@ b88c6a1b (Google Python team 2019-12-30 13:45:23 -0800 14)
222e6da8 (mshields@google.com 2010-11-29 20:32:06 +0000 16)
222e6da8 (mshields@google.com 2010-11-29 20:32:06 +0000 17) setlocal indentexpr=GetGooglePythonIndent(v:lnum)
```
+
## Further Information
* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1)