diff options
Diffstat (limited to 'git.html.markdown')
| -rw-r--r-- | git.html.markdown | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git.html.markdown b/git.html.markdown index b587e624..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. @@ -583,7 +585,8 @@ $ git rm /pather/to/the/file/HelloWorld.c ``` ### blame -Examine specific parts of the code's history and find out who was the last author to modify that line +Examine specific parts of the code's history and find out who was the last author to modify that line. + ```bash # find the authors on the latest modified lines $ git blame google_python_style.vim @@ -594,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) |