vim-fugitive/README.markdown

112 lines
4.8 KiB
Markdown
Raw Normal View History

2013-04-23 19:38:41 -04:00
# fugitive.vim
2010-02-24 22:48:40 -05:00
I'm not going to lie to you; fugitive.vim may very well be the best
Git wrapper of all time. Check out these features:
2019-08-03 20:55:33 -04:00
Bring up an enhanced version of `git status` with `:G` (also known as
`:Gstatus`). Press `g?` to bring up a list of mappings for numerous
operations including diffing, staging, committing, rebasing, and stashing.
2010-02-24 22:48:40 -05:00
View any blob, tree, commit, or tag in the repository with `:Gedit` (and
`:Gsplit`, `:Gvsplit`, `:Gtabedit`, ...). Edit a file in the index and
2019-08-03 20:27:20 -04:00
write to it to stage the changes. Use `:Gdiffsplit` to bring up the staged
2010-02-24 22:48:40 -05:00
version of the file side by side with the working tree version and use
Vim's diff handling capabilities to stage a subset of the file's
changes.
Commit, merge, and rebase with `:Gcommit`, `:Gmerge`, and `:Grebase`, using
the current Vim instance to edit commit messages and the rebase todo list.
Use `:Gpush`, `:Gfetch`, and `:Gpull` to send and retrieve upstream changes.
2010-02-24 22:48:40 -05:00
`:Gblame` brings up an interactive vertical split with `git blame`
2013-04-23 19:40:21 -04:00
output. Press enter on a line to edit the commit where the line
changed, or `o` to open it in a split. When you're done, use `:Gedit`
in the historic buffer to go back to the work tree version.
2010-02-24 22:48:40 -05:00
`:Gmove` does a `git mv` on a file and simultaneously renames the
buffer. `:Gdelete` does a `git rm` on a file and simultaneously deletes
2010-02-24 22:48:40 -05:00
the buffer.
Use `:Ggrep` to search the work tree (or any arbitrary commit) with
`git grep`, skipping over that which is not tracked in the repository.
`:Glog` loads all previous revisions of a file into the quickfix list so
2019-08-03 20:27:20 -04:00
you can iterate over them and watch the file evolve.
2010-02-24 22:48:40 -05:00
`:Gread` is a variant of `git checkout -- filename` that operates on the
buffer rather than the filename. This means you can use `u` to undo it
and you never get any warnings about the file changing outside Vim.
`:Gwrite` writes to both the work tree and index versions of a file,
making it like `git add` when called from a work tree file and like
`git checkout` when called from the index or a blob in history.
Use `:Gbrowse` to open the current file on the web front-end of your favorite
2019-08-03 20:27:20 -04:00
hosting provider, with optional line range (try it in visual mode). Plugins
are available for popular providers such as [GitHub][rhubarb.vim],
2019-02-12 11:19:18 -05:00
[GitLab][fugitive-gitlab.vim], [Bitbucket][fubitive.vim], and
[Gitee][fugitive-gitee.vim].
[rhubarb.vim]: https://github.com/tpope/vim-rhubarb
[fugitive-gitlab.vim]: https://github.com/shumphrey/fugitive-gitlab.vim
[fubitive.vim]: https://github.com/tommcdo/vim-fubitive
2018-12-22 15:25:41 -05:00
[fugitive-gitee.vim]: https://github.com/linuxsuren/fugitive-gitee.vim
2018-06-01 16:25:55 -04:00
Add `%{FugitiveStatusline()}` to `'statusline'` to get an indicator
2019-08-03 20:27:20 -04:00
with the current branch in your statusline.
2010-02-24 22:48:40 -05:00
Last but not least, there's `:Git` for running any arbitrary command.
2010-02-24 22:48:40 -05:00
2013-04-23 19:38:41 -04:00
## Screencasts
2011-06-02 21:38:56 -04:00
* [A complement to command line git](http://vimcasts.org/e/31)
* [Working with the git index](http://vimcasts.org/e/32)
* [Resolving merge conflicts with vimdiff](http://vimcasts.org/e/33)
* [Browsing the git object database](http://vimcasts.org/e/34)
* [Exploring the history of a git repository](http://vimcasts.org/e/35)
2013-04-23 19:38:41 -04:00
## Installation
2011-07-25 16:51:41 -04:00
If you don't have a preferred installation method, one option is to install
[pathogen.vim](https://github.com/tpope/vim-pathogen), and then copy
and paste:
2011-07-25 16:51:41 -04:00
cd ~/.vim/bundle
git clone https://github.com/tpope/vim-fugitive.git
vim -u NONE -c "helptags vim-fugitive/doc" -c q
2011-07-25 18:59:12 -04:00
2013-04-23 19:38:41 -04:00
## FAQ
2011-03-06 17:48:07 -05:00
2018-04-12 20:35:14 -04:00
> Why don't any of the commands exist?
2011-03-06 17:48:07 -05:00
2018-04-12 20:35:14 -04:00
Fugitive cares about the current file, not the current working directory.
Edit a file from the repository. To avoid the blank window problem, favor
commands like `:split` and `:tabedit` over commands like `:new` and `:tabnew`.
2011-03-06 17:48:07 -05:00
2019-08-03 20:32:27 -04:00
> Why can't I enter my password when I `:Gpush`?
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
option, the official solution is to use the `core.askPass` Git option to
request the password via a GUI. Fugitive will configure this for you
automatically if you have `ssh-askpass` or `git-gui` installed; otherwise it's
your responsibility to set this up.
As an absolute last resort, you can invoke `:Git --paginate push`. Fugitive
recognizes the pagination request and fires up a `:terminal`, which allows for
interactive password entry.
[credentials caching]: https://help.github.com/en/articles/caching-your-github-password-in-git
2013-04-23 19:38:41 -04:00
## Self-Promotion
Like fugitive.vim? Follow the repository on
2011-07-25 17:42:07 -04:00
[GitHub](https://github.com/tpope/vim-fugitive) and vote for it on
2011-06-02 21:37:06 -04:00
[vim.org](http://www.vim.org/scripts/script.php?script_id=2975). And if
2011-06-16 23:38:00 -04:00
you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
2011-06-02 21:37:06 -04:00
[Twitter](http://twitter.com/tpope) and
2011-07-25 17:42:07 -04:00
[GitHub](https://github.com/tpope).
2011-07-24 18:01:21 -04:00
2013-04-23 19:38:41 -04:00
## License
2011-07-24 18:01:21 -04:00
2011-08-29 20:49:59 -04:00
Copyright (c) Tim Pope. Distributed under the same terms as Vim itself.
See `:help license`.