mirror of
https://github.com/tpope/vim-fugitive.git
synced 2025-11-09 12:03:47 -05:00
Compare commits
113 Commits
http_githu
...
v2.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df103dc595 | ||
|
|
989fb15b8c | ||
|
|
123d2e096d | ||
|
|
f880016a30 | ||
|
|
fba20539e7 | ||
|
|
750db5e5b9 | ||
|
|
ffd8c0ad58 | ||
|
|
018ea3955b | ||
|
|
9f9dabc1f8 | ||
|
|
82580253e8 | ||
|
|
021918c3f6 | ||
|
|
0d7cb020bd | ||
|
|
30facffd5b | ||
|
|
f32bdf1a7b | ||
|
|
4a77929a32 | ||
|
|
dff9b92cde | ||
|
|
419f1ee910 | ||
|
|
e3904723f8 | ||
|
|
652c27a46b | ||
|
|
336c716ba0 | ||
|
|
585fcc8a9b | ||
|
|
4b75c7bff2 | ||
|
|
b0bc71460a | ||
|
|
061a81f247 | ||
|
|
15fbbf7296 | ||
|
|
64c690603e | ||
|
|
269c89ef59 | ||
|
|
e6e259c2d2 | ||
|
|
3e3a899cf1 | ||
|
|
cad80493f4 | ||
|
|
aed0043a1f | ||
|
|
c5a3c5f8ce | ||
|
|
0a19a3e78f | ||
|
|
7fd14b218e | ||
|
|
99809a021c | ||
|
|
2b05b275f5 | ||
|
|
c4713200f7 | ||
|
|
545578538c | ||
|
|
6f5fd2add0 | ||
|
|
416165f063 | ||
|
|
f8bf95b9ff | ||
|
|
46ca7374f0 | ||
|
|
c99f0ff06b | ||
|
|
07c58226df | ||
|
|
4f80883e05 | ||
|
|
bf14c9c8a3 | ||
|
|
e7c7149434 | ||
|
|
c8070aec7e | ||
|
|
21b60b309d | ||
|
|
9649b02076 | ||
|
|
cbab574164 | ||
|
|
72d382077c | ||
|
|
17393f552e | ||
|
|
51cdb1b190 | ||
|
|
c1664de7b4 | ||
|
|
d6540b2588 | ||
|
|
22cc877e64 | ||
|
|
218fc37ce1 | ||
|
|
3bfa0a2725 | ||
|
|
fd297ad11f | ||
|
|
a069fa7066 | ||
|
|
d6f17608dd | ||
|
|
70ec927890 | ||
|
|
b27937d5e4 | ||
|
|
152c9195ae | ||
|
|
7c40a18bfd | ||
|
|
f395f3cbea | ||
|
|
0765cbe466 | ||
|
|
0cb30541ec | ||
|
|
190fe2a4cf | ||
|
|
8f0b8edfbd | ||
|
|
546a6bf219 | ||
|
|
1b0ddad697 | ||
|
|
07c078c1be | ||
|
|
6b338bdbcf | ||
|
|
34e2d2538a | ||
|
|
dc250fcc8d | ||
|
|
050b22e531 | ||
|
|
ea18a6a89b | ||
|
|
61fac2f738 | ||
|
|
124550cfee | ||
|
|
00b0916ae2 | ||
|
|
f096152a48 | ||
|
|
3b5f715262 | ||
|
|
54ead5abcb | ||
|
|
25bbb3c5f5 | ||
|
|
5f7a8a9935 | ||
|
|
5c18b1a044 | ||
|
|
4c7e649efb | ||
|
|
618d884562 | ||
|
|
cbb7c3e890 | ||
|
|
d4c615c427 | ||
|
|
f6d93b8788 | ||
|
|
09cbdded83 | ||
|
|
06fafb1324 | ||
|
|
a917e998c7 | ||
|
|
2ae214a156 | ||
|
|
0103538d7a | ||
|
|
a27b899a36 | ||
|
|
6462bdb4b9 | ||
|
|
1da788a1b0 | ||
|
|
bbf9e51eb2 | ||
|
|
cf3fe781dd | ||
|
|
1bce4328e4 | ||
|
|
1601ffc1e0 | ||
|
|
b9525df190 | ||
|
|
582eb0d3c9 | ||
|
|
d1406ae23a | ||
|
|
d63a475fcb | ||
|
|
2723a1116f | ||
|
|
7df3a6894a | ||
|
|
6f380fa8c6 | ||
|
|
f64ba46509 |
18
CONTRIBUTING.markdown
Normal file
18
CONTRIBUTING.markdown
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
Before reporting a bug, you should try stripping down your Vim configuration
|
||||||
|
and removing other plugins. The sad truth about VimScript is that it is
|
||||||
|
fraught with incompatibilities waiting to happen. I'm happy to work around
|
||||||
|
them where I can, but it's up to you to isolate the conflict.
|
||||||
|
|
||||||
|
Fugitive is particularly prone to regressions due to Git version issues,
|
||||||
|
platform issues, and interactions with other plugins. I end up bisecting a
|
||||||
|
lot more than other projects, and thus I'm especially meticulous here about
|
||||||
|
maintaining a clean, readable, history. Squash and force push any requested
|
||||||
|
changes to a pull request. And if your [commit message
|
||||||
|
sucks](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
|
||||||
|
I'm not going to accept it. Period.
|
||||||
|
|
||||||
|
Beyond that, don't be shy about asking before patching. What takes you hours
|
||||||
|
might take me minutes simply because I have both domain knowledge and a
|
||||||
|
perverse knowledge of VimScript so vast that many would consider it a symptom
|
||||||
|
of mental illness. On the flip side, some ideas I'll reject no matter how
|
||||||
|
good the implementation is. "Send a patch" is an edge case answer in my book.
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
fugitive.vim
|
# fugitive.vim
|
||||||
============
|
|
||||||
|
|
||||||
I'm not going to lie to you; fugitive.vim may very well be the best
|
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:
|
Git wrapper of all time. Check out these features:
|
||||||
@@ -12,13 +11,13 @@ Vim's diff handling capabilities to stage a subset of the file's
|
|||||||
changes.
|
changes.
|
||||||
|
|
||||||
Bring up the output of `git status` with `:Gstatus`. Press `-` to
|
Bring up the output of `git status` with `:Gstatus`. Press `-` to
|
||||||
`add`/`reset` a file's changes, or `p` to `add`/`reset` `--patch` that
|
`add`/`reset` a file's changes, or `p` to `add`/`reset` `--patch`. And guess
|
||||||
mofo. And guess what `:Gcommit` does!
|
what `:Gcommit` does!
|
||||||
|
|
||||||
`:Gblame` brings up an interactive vertical split with `git blame`
|
`:Gblame` brings up an interactive vertical split with `git blame`
|
||||||
output. Press enter on a line to reblame the file as it stood in that
|
output. Press enter on a line to edit the commit where the line
|
||||||
commit, or `o` to open that commit in a split. When you're done, use
|
changed, or `o` to open it in a split. When you're done, use `:Gedit`
|
||||||
`:Gedit` in the historic buffer to go back to the work tree version.
|
in the historic buffer to go back to the work tree version.
|
||||||
|
|
||||||
`:Gmove` does a `git mv` on a file and simultaneously renames the
|
`:Gmove` does a `git mv` on a file and simultaneously renames the
|
||||||
buffer. `:Gremove` does a `git rm` on a file and simultaneously deletes
|
buffer. `:Gremove` does a `git rm` on a file and simultaneously deletes
|
||||||
@@ -46,8 +45,7 @@ with the current branch in (surprise!) your statusline.
|
|||||||
Last but not least, there's `:Git` for running any arbitrary command,
|
Last but not least, there's `:Git` for running any arbitrary command,
|
||||||
and `Git!` to open the output of a command in a temp file.
|
and `Git!` to open the output of a command in a temp file.
|
||||||
|
|
||||||
Screencasts
|
## Screencasts
|
||||||
-----------
|
|
||||||
|
|
||||||
* [A complement to command line git](http://vimcasts.org/e/31)
|
* [A complement to command line git](http://vimcasts.org/e/31)
|
||||||
* [Working with the git index](http://vimcasts.org/e/32)
|
* [Working with the git index](http://vimcasts.org/e/32)
|
||||||
@@ -55,8 +53,7 @@ Screencasts
|
|||||||
* [Browsing the git object database](http://vimcasts.org/e/34)
|
* [Browsing the git object database](http://vimcasts.org/e/34)
|
||||||
* [Exploring the history of a git repository](http://vimcasts.org/e/35)
|
* [Exploring the history of a git repository](http://vimcasts.org/e/35)
|
||||||
|
|
||||||
Installation
|
## Installation
|
||||||
------------
|
|
||||||
|
|
||||||
If you don't have a preferred installation method, I recommend
|
If you don't have a preferred installation method, I recommend
|
||||||
installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
|
installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
|
||||||
@@ -72,8 +69,7 @@ If your Vim version is below 7.2, I recommend also installing
|
|||||||
[vim-git](https://github.com/tpope/vim-git) for syntax highlighting and
|
[vim-git](https://github.com/tpope/vim-git) for syntax highlighting and
|
||||||
other Git niceties.
|
other Git niceties.
|
||||||
|
|
||||||
FAQ
|
## FAQ
|
||||||
---
|
|
||||||
|
|
||||||
> I installed the plugin and started Vim. Why don't any of the commands
|
> I installed the plugin and started Vim. Why don't any of the commands
|
||||||
> exist?
|
> exist?
|
||||||
@@ -109,32 +105,7 @@ to open after any grep invocation:
|
|||||||
|
|
||||||
autocmd QuickFixCmdPost *grep* cwindow
|
autocmd QuickFixCmdPost *grep* cwindow
|
||||||
|
|
||||||
Contributing
|
## Self-Promotion
|
||||||
------------
|
|
||||||
|
|
||||||
Before reporting a bug, you should try stripping down your Vim
|
|
||||||
configuration and removing other plugins. The sad nature of VimScript
|
|
||||||
is that it is fraught with incompatibilities waiting to happen. I'm
|
|
||||||
happy to work around them where I can, but it's up to you to isolate
|
|
||||||
the conflict.
|
|
||||||
|
|
||||||
If your [commit message sucks](http://stopwritingramblingcommitmessages.com/),
|
|
||||||
I'm not going to accept your pull request. I've explained very politely
|
|
||||||
dozens of times that
|
|
||||||
[my general guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
|
|
||||||
are absolute rules on my own repositories, so I may lack the energy to
|
|
||||||
explain it to you yet another time. And please, if I ask you to change
|
|
||||||
something, `git commit --amend`.
|
|
||||||
|
|
||||||
Beyond that, don't be shy about asking before patching. What takes you
|
|
||||||
hours might take me minutes simply because I have both domain knowledge
|
|
||||||
and a perverse knowledge of VimScript so vast that many would consider
|
|
||||||
it a symptom of mental illness. On the flip side, some ideas I'll
|
|
||||||
reject no matter how good the implementation is. "Send a patch" is an
|
|
||||||
edge case answer in my book.
|
|
||||||
|
|
||||||
Self-Promotion
|
|
||||||
--------------
|
|
||||||
|
|
||||||
Like fugitive.vim? Follow the repository on
|
Like fugitive.vim? Follow the repository on
|
||||||
[GitHub](https://github.com/tpope/vim-fugitive) and vote for it on
|
[GitHub](https://github.com/tpope/vim-fugitive) and vote for it on
|
||||||
@@ -143,8 +114,7 @@ you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
|
|||||||
[Twitter](http://twitter.com/tpope) and
|
[Twitter](http://twitter.com/tpope) and
|
||||||
[GitHub](https://github.com/tpope).
|
[GitHub](https://github.com/tpope).
|
||||||
|
|
||||||
License
|
## License
|
||||||
-------
|
|
||||||
|
|
||||||
Copyright (c) Tim Pope. Distributed under the same terms as Vim itself.
|
Copyright (c) Tim Pope. Distributed under the same terms as Vim itself.
|
||||||
See `:help license`.
|
See `:help license`.
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ that are part of Git repositories).
|
|||||||
window. The following maps, which work on the cursor
|
window. The following maps, which work on the cursor
|
||||||
line file where sensible, are provided:
|
line file where sensible, are provided:
|
||||||
|
|
||||||
|
g? show this help
|
||||||
<C-N> next file
|
<C-N> next file
|
||||||
<C-P> previous file
|
<C-P> previous file
|
||||||
<CR> |:Gedit|
|
<CR> |:Gedit|
|
||||||
@@ -54,7 +55,7 @@ that are part of Git repositories).
|
|||||||
p |:Git| add --patch
|
p |:Git| add --patch
|
||||||
p |:Git| reset --patch (staged files)
|
p |:Git| reset --patch (staged files)
|
||||||
q close status
|
q close status
|
||||||
R reload status
|
r reload status
|
||||||
S |:Gvsplit|
|
S |:Gvsplit|
|
||||||
|
|
||||||
*fugitive-:Gcommit*
|
*fugitive-:Gcommit*
|
||||||
@@ -122,7 +123,7 @@ that are part of Git repositories).
|
|||||||
|
|
||||||
:{range}Gread! [args] |:read| the output of a Git command after {range}.
|
:{range}Gread! [args] |:read| the output of a Git command after {range}.
|
||||||
|
|
||||||
*fugitive-:Gwrite*
|
*fugitive-:Gw* *fugitive-:Gwrite*
|
||||||
:Gwrite Write to the current file's path and stage the results.
|
:Gwrite Write to the current file's path and stage the results.
|
||||||
When run in a work tree file, it is effectively git
|
When run in a work tree file, it is effectively git
|
||||||
add. Elsewhere, it is effectively git-checkout. A
|
add. Elsewhere, it is effectively git-checkout. A
|
||||||
@@ -148,14 +149,16 @@ that are part of Git repositories).
|
|||||||
index is used (which means a three-way diff during a
|
index is used (which means a three-way diff during a
|
||||||
merge conflict, making it a git-mergetool
|
merge conflict, making it a git-mergetool
|
||||||
alternative). The newer of the two files is placed
|
alternative). The newer of the two files is placed
|
||||||
to the right. Use |do| and |dp| and write to the
|
to the right or bottom, depending on 'diffopt' and
|
||||||
index file to simulate "git add --patch".
|
the width of the window relative to 'textwidth'. Use
|
||||||
|
|do| and |dp| and write to the index file to simulate
|
||||||
|
"git add --patch".
|
||||||
|
|
||||||
*fugitive-:Gsdiff*
|
*fugitive-:Gsdiff*
|
||||||
:Gsdiff [revision] Like |:Gdiff|, but split horizontally.
|
:Gsdiff [revision] Like |:Gdiff|, but always split horizontally.
|
||||||
|
|
||||||
*fugitive-:Gvdiff*
|
*fugitive-:Gvdiff*
|
||||||
:Gvdiff [revision] Identical to |:Gdiff|. For symmetry with |:Gsdiff|.
|
:Gvdiff [revision] Like |:Gdiff|, but always split vertically.
|
||||||
|
|
||||||
*fugitive-:Gmove*
|
*fugitive-:Gmove*
|
||||||
:Gmove {destination} Wrapper around git-mv that renames the buffer
|
:Gmove {destination} Wrapper around git-mv that renames the buffer
|
||||||
@@ -171,18 +174,18 @@ that are part of Git repositories).
|
|||||||
|
|
||||||
*fugitive-:Gblame*
|
*fugitive-:Gblame*
|
||||||
:Gblame [flags] Run git-blame on the file and open the results in a
|
:Gblame [flags] Run git-blame on the file and open the results in a
|
||||||
scroll bound vertical split. Press enter on a line to
|
scroll bound vertical split. You can give any of
|
||||||
reblame the file as it was in that commit. You can
|
ltfnsewMC as flags and they will be passed along to
|
||||||
give any of ltfnsewMC as flags and they will be passed
|
git-blame. The following maps, which work on the
|
||||||
along to git-blame. The following maps, which work on
|
cursor line commit where sensible, are provided:
|
||||||
the cursor line commit where sensible, are provided:
|
|
||||||
|
|
||||||
|
g? show this help
|
||||||
A resize to end of author column
|
A resize to end of author column
|
||||||
C resize to end of commit column
|
C resize to end of commit column
|
||||||
D resize to end of date/time column
|
D resize to end of date/time column
|
||||||
q close blame and return to blamed window
|
q close blame and return to blamed window
|
||||||
gq q, then |:Gedit| to return to work tree version
|
gq q, then |:Gedit| to return to work tree version
|
||||||
i q, then open commit
|
<CR> q, then open commit
|
||||||
o open commit in horizontal split
|
o open commit in horizontal split
|
||||||
O open commit in new tab
|
O open commit in new tab
|
||||||
- reblame at commit
|
- reblame at commit
|
||||||
@@ -203,7 +206,7 @@ that are part of Git repositories).
|
|||||||
To use with GitHub FI, point g:fugitive_github_domains
|
To use with GitHub FI, point g:fugitive_github_domains
|
||||||
at a list of domains:
|
at a list of domains:
|
||||||
>
|
>
|
||||||
let g:fugitive_github_domains = ['git.example.com']
|
let g:fugitive_github_domains = ['https://example.com']
|
||||||
~
|
~
|
||||||
:[range]Gbrowse! Like :Gbrowse, but put the URL on the clipboard rather
|
:[range]Gbrowse! Like :Gbrowse, but put the URL on the clipboard rather
|
||||||
than opening it.
|
than opening it.
|
||||||
@@ -258,6 +261,10 @@ P Go to the current file in the [count]th parent.
|
|||||||
*fugitive-C*
|
*fugitive-C*
|
||||||
C Go to the commit containing the current file.
|
C Go to the commit containing the current file.
|
||||||
|
|
||||||
|
*fugitive-.*
|
||||||
|
. Start a |:| command line with the current revision
|
||||||
|
prepopulated at the end of the line.
|
||||||
|
|
||||||
*fugitive-a*
|
*fugitive-a*
|
||||||
a Show the current tag, commit, or tree in an alternate
|
a Show the current tag, commit, or tree in an alternate
|
||||||
format.
|
format.
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user