From 1e56f1a37318f0b8703b3a541eec5500759244d2 Mon Sep 17 00:00:00 2001 From: Igor Irianto Date: Tue, 16 Feb 2021 15:53:54 -0600 Subject: [PATCH] Update image alt name --- ch18_git.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ch18_git.md b/ch18_git.md index b329479..fe00f60 100644 --- a/ch18_git.md +++ b/ch18_git.md @@ -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.

- Finding files in FZF + Diffing Apples

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.

- Finding files in FZF + Fugitive Git

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`.

- Finding files in FZF + Fugitive Git Blame

## 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 `, vim-fugitive runs a `vimdiff` against that file inside ``.

- Finding files in FZF + Fugitive Gdiffsplit

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`.

- Finding files in FZF + Fugitive Git Log

While in this `"git log"` mode, you can do two things: