mirror of
https://github.com/tpope/vim-fugitive.git
synced 2025-11-13 13:53:51 -05:00
Rewrite feature summary in README
This commit is contained in:
105
README.markdown
105
README.markdown
@@ -1,54 +1,65 @@
|
|||||||
# fugitive.vim
|
# fugitive.vim
|
||||||
|
|
||||||
I'm not going to lie to you; fugitive.vim may very well be the best
|
Fugitive is the premiere Vim plugin for Git. Or maybe it's the premiere Git
|
||||||
Git wrapper of all time. Check out these features:
|
plugin for Vim? Either way, it's "so awesome, it should be illegal". That's
|
||||||
|
why it's called Fugitive.
|
||||||
|
|
||||||
Bring up an enhanced version of `git status` with `:G` (also known as
|
The crown jewel of Fugitive is `:Git` (or just `:G`), which calls any
|
||||||
`:Gstatus`). Press `g?` to bring up a list of maps for numerous operations
|
arbitrary Git command. If you know how to use Git at the command line, you
|
||||||
including diffing, staging, committing, rebasing, and stashing.
|
know how to use `:Git`. It's vaguely akin to `:!git` but with numerous
|
||||||
|
improvements:
|
||||||
|
|
||||||
View any blob, tree, commit, or tag in the repository with `:Gedit` (and
|
* The default behavior is to directly echo the command's output. Quiet
|
||||||
`:Gsplit`, `:Gvsplit`, `:Gtabedit`, ...). Edit a file in the index and
|
commands like `:Git add` avoid the dreaded "Press ENTER or type command to
|
||||||
write to it to stage the changes. Use `:Gdiffsplit` to bring up the staged
|
continue" prompt.
|
||||||
version of the file side by side with the working tree version and use
|
* `:Git commit`, `:Git rebase -i`, and other commands that invoke an editor do
|
||||||
Vim's diff handling capabilities to stage a subset of the file's
|
their editing in the current Vim instance.
|
||||||
changes.
|
* `:Git diff`, `:Git log`, and other verbose, paginated commands have their
|
||||||
|
output loaded into a temporary buffer. Force this behavior for any command
|
||||||
|
with `:Git --paginate` or `:Git -p`.
|
||||||
|
* `:Git blame` uses a temporary buffer with maps for additional triage. Press
|
||||||
|
enter on a line to view the commit where the line changed, or `g?` to see
|
||||||
|
other available maps. Omit the filename argument and the currently edited
|
||||||
|
file will be blamed in a vertical, scroll-bound split.
|
||||||
|
* `:Git grep` loads matches into the quickfix list, just like `:grep`.
|
||||||
|
* `:Git mergetool` and `:Git difftool` load their changesets into the quickfix
|
||||||
|
list.
|
||||||
|
* Called with no arguments, `:Git` opens a summary window with dirty files and
|
||||||
|
unpushed and unpulled commits. Press `g?` to bring up a list of maps for
|
||||||
|
numerous operations including diffing, staging, committing, rebasing, and
|
||||||
|
stashing. (This is the successor to the old `:Gstatus`.)
|
||||||
|
* This command (along with all other commands) always uses the current
|
||||||
|
buffer's repository, so you don't need to worry about the current working
|
||||||
|
directory.
|
||||||
|
|
||||||
Commit, merge, and rebase with `:Gcommit`, `:Gmerge`, and `:Grebase`, using
|
Additional commands are provided for higher level operations:
|
||||||
the current Vim instance to edit commit messages and the rebase todo list.
|
|
||||||
Use `:Gpush`, `:Gfetch`, and `:Gpull` to send and retrieve upstream changes.
|
|
||||||
|
|
||||||
`:Gblame` brings up an interactive vertical split with `git blame`
|
* View any blob, tree, commit, or tag in the repository with `:Gedit` (and
|
||||||
output. Press enter on a line to edit the commit where the line
|
`:Gsplit`, etc.). For example, `:Gedit HEAD~3:%` loads the current file as
|
||||||
changed, or `o` to open it in a split. When you're done, use `:Gedit`
|
it existed 3 commits ago.
|
||||||
in the historic buffer to go back to the work tree version.
|
* `:Gdiffsplit` brings up the staged version of the file side by side with the
|
||||||
|
working tree version. Use Vim's diff handling capabilities to apply changes
|
||||||
`:Gmove` does a `git mv` on a file and simultaneously renames the
|
to the staged version, and write that buffer to stage the changes. You can
|
||||||
buffer. `:Gdelete` does a `git rm` on a file and simultaneously deletes
|
also give an arbitrary `:Gedit` argument to diff against older versions of
|
||||||
the buffer.
|
the file.
|
||||||
|
* `:Gread` is a variant of `git checkout -- filename` that operates on the
|
||||||
Use `:Ggrep` to search the work tree (or any arbitrary commit) with
|
buffer rather than the file itself. This means you can use `u` to undo it
|
||||||
`git grep`, skipping over that which is not tracked in the repository.
|
and you never get any warnings about the file changing outside Vim.
|
||||||
`:Gclog` and `:Gllog` load all previous commits into the quickfix or location
|
* `:Gwrite` writes to both the work tree and index versions of a file, making
|
||||||
list. Give them a range (e.g., using visual mode and `:'<,'>Gclog`) to
|
it like `git add` when called from a work tree file and like `git checkout`
|
||||||
iterate over every change to that portion of the current file.
|
when called from the index or a blob in history.
|
||||||
|
* `:GMove` does a `git mv` on the current file and changes the buffer name to
|
||||||
`:Git mergetool` loads conflicts into the quickfix list. `:Git difftool` does
|
match. `:GRename` does the same with a destination filename relative to the
|
||||||
the same for any arbitrary set of changes.
|
current file's directory.
|
||||||
|
* `:GDelete` does a `git rm` on the current file and simultaneously deletes
|
||||||
`:Gread` is a variant of `git checkout -- filename` that operates on the
|
the buffer. `:GRemove` does the same but leaves the (now empty) buffer
|
||||||
buffer rather than the filename. This means you can use `u` to undo it
|
open.
|
||||||
and you never get any warnings about the file changing outside Vim.
|
* `:GBrowse` to open the current file on the web front-end of your favorite
|
||||||
`:Gwrite` writes to both the work tree and index versions of a file,
|
hosting provider, with optional line range (try it in visual mode). Plugins
|
||||||
making it like `git add` when called from a work tree file and like
|
are available for popular providers such as [GitHub][rhubarb.vim],
|
||||||
`git checkout` when called from the index or a blob in history.
|
[GitLab][fugitive-gitlab.vim], [Bitbucket][fubitive.vim],
|
||||||
|
[Gitee][fugitive-gitee.vim], [Pagure][pagure], and
|
||||||
Use `:Gbrowse` to open the current file on the web front-end of your favorite
|
[Phabricator][vim-phabricator].
|
||||||
hosting provider, with optional line range (try it in visual mode). Plugins
|
|
||||||
are available for popular providers such as [GitHub][rhubarb.vim],
|
|
||||||
[GitLab][fugitive-gitlab.vim], [Bitbucket][fubitive.vim],
|
|
||||||
[Gitee][fugitive-gitee.vim], [Pagure][pagure], and
|
|
||||||
[Phabricator][vim-phabricator].
|
|
||||||
|
|
||||||
[rhubarb.vim]: https://github.com/tpope/vim-rhubarb
|
[rhubarb.vim]: https://github.com/tpope/vim-rhubarb
|
||||||
[fugitive-gitlab.vim]: https://github.com/shumphrey/fugitive-gitlab.vim
|
[fugitive-gitlab.vim]: https://github.com/shumphrey/fugitive-gitlab.vim
|
||||||
@@ -60,8 +71,6 @@ are available for popular providers such as [GitHub][rhubarb.vim],
|
|||||||
Add `%{FugitiveStatusline()}` to `'statusline'` to get an indicator
|
Add `%{FugitiveStatusline()}` to `'statusline'` to get an indicator
|
||||||
with the current branch in your statusline.
|
with the current branch in your statusline.
|
||||||
|
|
||||||
Last but not least, there's `:Git` for running any arbitrary command.
|
|
||||||
|
|
||||||
For more information, see `:help fugitive`.
|
For more information, see `:help fugitive`.
|
||||||
|
|
||||||
## Screencasts
|
## Screencasts
|
||||||
@@ -83,7 +92,7 @@ Install using your favorite package manager, or use Vim's built-in package suppo
|
|||||||
|
|
||||||
## FAQ
|
## FAQ
|
||||||
|
|
||||||
> Why can't I enter my password when I `:Gpush`?
|
> Why can't I enter my password when I `:Git push`?
|
||||||
|
|
||||||
It is highly recommended to use SSH keys or [credentials caching][] to avoid
|
It is highly recommended to use SSH keys or [credentials caching][] to avoid
|
||||||
entering your password on every upstream interaction. If this isn't an
|
entering your password on every upstream interaction. If this isn't an
|
||||||
|
|||||||
Reference in New Issue
Block a user