Mirrors/Learn-Vim
2
0
Fork 0
mirror of https://github.com/iggredible/Learn-Vim synced 2024-11-27 04:50:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update image alt name

Browse source
This commit is contained in:
Igor Irianto 2021-02-16 15:53:54 -06:00
parent 375b2a9783
commit 1e56f1a373
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ch18_git.md
View file

@ -57,7 +57,7 @@ vim -d file1.txt file2.txt
Suppose you want to make the second buffer to have apples, not oranges. To transfer the content from your current position (you're currently on `file1.txt`) to `file2.txt`, first go to the next diff with `]c` (to jump to the previous diff window, use `[c`). The cursor should be on apples now. Run `:diffput`. Both files should now have apples.
<p align="center">
<img alt="Finding files in FZF" width="900" height="auto" src="images/diffing-apples.png">
<img alt="Diffing Apples" width="900" height="auto" src="images/diffing-apples.png">
</p>
If you need to transfer the text from the other buffer (orange juice, `file2.txt`) to replace the text on the current buffer (apple juice, `file1.txt`), with your cursor still on `file1.txt` window, first go to the next diff with `]c`. Your cursor now should be on apple juice. Run `:diffget` to get the orange juice from another buffer to replace apple juice in our buffer.
@ -277,7 +277,7 @@ When you run the `:Git` command without any parameters, vim-fugitive displays a
- `>` / `<` to display or hide an inline diff of the file name under the cursor.
<p align="center">
<img alt="Finding files in FZF" width="900" height="auto" src="images/fugitive-git.png">
<img alt="Fugitive Git" width="900" height="auto" src="images/fugitive-git.png">
</p>
For more, check out `:h fugitive-staging-maps`.
@ -295,7 +295,7 @@ Some things you can do while in this `"git blame"` mode:
For more, check out `:h :Git_blame`.
<p align="center">
<img alt="Finding files in FZF" width="900" height="auto" src="images/fugitive-git-blame.png">
<img alt="Fugitive Git Blame" width="900" height="auto" src="images/fugitive-git-blame.png">
</p>
## Gdiffsplit
@ -303,7 +303,7 @@ For more, check out `:h :Git_blame`.
When you run the `:Gdiffsplit` command, vim-fugitive runs a `vimdiff` of the current file's latest changes against the index or work tree. If you run `:Gdiffsplit <commit>`, vim-fugitive runs a `vimdiff` against that file inside `<commit>`.
<p align="center">
<img alt="Finding files in FZF" width="900" height="auto" src="images/fugitive-gdiffsplit.png">
<img alt="Fugitive Gdiffsplit" width="900" height="auto" src="images/fugitive-gdiffsplit.png">
</p>
Because you are in a `vimdiff` mode, you can *get* or *put* the diff with `:diffput` and `:diffget`.
@ -319,7 +319,7 @@ When you run the `:Gread` command in a file after you make changes, vim-fugitive
When you run the `:Gclog` command, vim-fugitive displays the commit history. It is like running the `git log` command. Vim-fugitive uses Vim's quickfix to accomplish this, so you can use `:cnext` and `:cprevious` to traverse to the next or previous log information. You can open and close the log list with `:copen` and `:cclose`.
<p align="center">
<img alt="Finding files in FZF" width="900" height="auto" src="images/fugitive-git-log.png">
<img alt="Fugitive Git Log" width="900" height="auto" src="images/fugitive-git-log.png">
</p>
While in this `"git log"` mode, you can do two things: