mirror of
https://github.com/tpope/vim-fugitive.git
synced 2025-11-08 11:33:47 -05:00
Compare commits
491 Commits
v1.1
...
blame_mess
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
62c50ff296 | ||
|
|
c2877d0d5c | ||
|
|
c640ee78a8 | ||
|
|
c9b26e20d3 | ||
|
|
79f4a49a94 | ||
|
|
0cb46585ac | ||
|
|
d4df8882c5 | ||
|
|
d5208d494f | ||
|
|
cf248fa66d | ||
|
|
779949c255 | ||
|
|
785bb15745 | ||
|
|
fbf89773b4 | ||
|
|
02a0be79aa | ||
|
|
b2767d204b | ||
|
|
26504eecbd | ||
|
|
0d281a2607 | ||
|
|
b2665cc650 | ||
|
|
c3052fba84 | ||
|
|
4f24757df2 | ||
|
|
eb945e9a11 | ||
|
|
90cbbf5854 | ||
|
|
87c1bda4d5 | ||
|
|
c5c1bd66d8 | ||
|
|
f44845e440 | ||
|
|
245ce889e2 | ||
|
|
444ba9fda5 | ||
|
|
b754bc2031 | ||
|
|
b3a8be6975 | ||
|
|
58ed86e434 | ||
|
|
aac85a268e | ||
|
|
c00ebd75ac | ||
|
|
50cc268d29 | ||
|
|
4865891565 | ||
|
|
3439f999b1 | ||
|
|
6460734b5e | ||
|
|
bdd216827a | ||
|
|
0ac4915cd7 | ||
|
|
841adb49ad | ||
|
|
57afba5bdd | ||
|
|
e1ae9effbc | ||
|
|
19d1c944db | ||
|
|
9315ec694d | ||
|
|
90250785d1 | ||
|
|
099d65826e | ||
|
|
008b957086 | ||
|
|
16c2b7abb9 | ||
|
|
1e3f1103d9 | ||
|
|
9835920a3c | ||
|
|
fd36aa9c61 | ||
|
|
4dd41688cf | ||
|
|
18d6d1ab82 | ||
|
|
9ce67cdc93 | ||
|
|
bf04261080 | ||
|
|
52d180af0a | ||
|
|
14daf094d9 | ||
|
|
ac904e806d | ||
|
|
9f768cd3bc | ||
|
|
09cdce7add | ||
|
|
8851b8fe64 | ||
|
|
cfa485ede7 | ||
|
|
207c643ea4 | ||
|
|
cac2c8ef8e | ||
|
|
a9a22e0e4e | ||
|
|
c3e918072f | ||
|
|
d854197c03 | ||
|
|
d8ce8d1d03 | ||
|
|
23faeadc7c | ||
|
|
1ecd12d523 | ||
|
|
f8aa87a4b5 | ||
|
|
dba8a0705d | ||
|
|
8cf3d94a3a | ||
|
|
28de2a1ddd | ||
|
|
01cda4d443 | ||
|
|
b5188a1b4f | ||
|
|
8e63140181 | ||
|
|
cec56ef5ff | ||
|
|
1e755064e9 | ||
|
|
0b43b51d77 | ||
|
|
5dcf8a0175 | ||
|
|
2509641eac | ||
|
|
073f3a37b9 | ||
|
|
b7b23001de | ||
|
|
b319b69453 | ||
|
|
03cc95cc19 | ||
|
|
7c4a906147 | ||
|
|
b5b2548a87 | ||
|
|
ca727b07f1 | ||
|
|
0fbbe0b3a4 | ||
|
|
1c844375fa | ||
|
|
e065e4f841 | ||
|
|
21b6dd7aee | ||
|
|
935a2cccd3 | ||
|
|
c2908b174d | ||
|
|
b0e38f08dc | ||
|
|
4cc201cbe3 | ||
|
|
baa05dcfda | ||
|
|
0095769029 | ||
|
|
e8b94098bb | ||
|
|
eb8eb1850a | ||
|
|
933f6a1e1d | ||
|
|
34719016ec | ||
|
|
2c8461db08 | ||
|
|
d3b98d9886 | ||
|
|
5699f4613c | ||
|
|
0374322ba5 | ||
|
|
90ee6fb5d2 | ||
|
|
04fe4bfcd9 | ||
|
|
7423d72b51 | ||
|
|
24d4098ceb | ||
|
|
5aaa65736d | ||
|
|
5d1c219ee5 | ||
|
|
a739112bfc | ||
|
|
d376506177 | ||
|
|
9af975c82c | ||
|
|
11f89ba749 | ||
|
|
45e5317200 | ||
|
|
ee2b0ecdb8 | ||
|
|
94a5d6fe2f | ||
|
|
0cd33c6170 | ||
|
|
6239f5ed8e | ||
|
|
188692556a | ||
|
|
716f3d2d4e | ||
|
|
8576741d61 | ||
|
|
32957cb552 | ||
|
|
fdc8569c18 | ||
|
|
7fb703534a | ||
|
|
41cdbdcd62 | ||
|
|
91900baad1 | ||
|
|
fb5661211d | ||
|
|
276f89837f | ||
|
|
4581cd4217 | ||
|
|
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 | ||
|
|
003f38c6a4 | ||
|
|
3f703b6e03 | ||
|
|
9afeebf32e | ||
|
|
09743e76a0 | ||
|
|
14958f37e3 | ||
|
|
05763df0ed | ||
|
|
f43393dd9a | ||
|
|
daccfb508f | ||
|
|
cdb7bd9841 | ||
|
|
554909ed4b | ||
|
|
3463b780df | ||
|
|
31dead6d80 | ||
|
|
cff78c3ab4 | ||
|
|
41383131b8 | ||
|
|
615f6608f1 | ||
|
|
8d019de97c | ||
|
|
b5725c1eec | ||
|
|
381b275bc9 | ||
|
|
f5b50f822b | ||
|
|
a0c71a6d4c | ||
|
|
0abe1fb122 | ||
|
|
a90cc48c7a | ||
|
|
b0c74e2289 | ||
|
|
745ccf5066 | ||
|
|
d1971558b5 | ||
|
|
8ba04c2476 | ||
|
|
ca6d4ca4d1 | ||
|
|
585ca691a3 | ||
|
|
5298448e88 | ||
|
|
9ebff45853 | ||
|
|
8fd12ef14f | ||
|
|
57af9b98cf | ||
|
|
3b278277e0 | ||
|
|
49c6be334c | ||
|
|
1eb4a9f7e3 | ||
|
|
6515bd43ac | ||
|
|
a8d450fcfe | ||
|
|
476fbd0950 | ||
|
|
43741b550d | ||
|
|
765c921e1f | ||
|
|
5ceabc6e6a | ||
|
|
1b6c0cbfb6 | ||
|
|
60fdd95b95 | ||
|
|
15e7672672 | ||
|
|
4fe6e46a0a | ||
|
|
9bfb7857ec | ||
|
|
75a27559a3 | ||
|
|
dfba6a17f6 | ||
|
|
859f7eaa70 | ||
|
|
b72bb7b289 | ||
|
|
9619055cfd | ||
|
|
48daf7ae72 | ||
|
|
b18bb05b91 | ||
|
|
96db5642a1 | ||
|
|
693d32cdd4 | ||
|
|
b978d9f0be | ||
|
|
49e6c2b676 | ||
|
|
39012290b8 | ||
|
|
89e771ea96 | ||
|
|
51de95ddee | ||
|
|
e8e497eb83 | ||
|
|
e142a27ab8 | ||
|
|
3c641a7ef5 | ||
|
|
c6931a519f | ||
|
|
41ea90cddf | ||
|
|
4f7af188fe | ||
|
|
24e9b492fe | ||
|
|
bc3ffa6b44 | ||
|
|
8ecc9b9e11 | ||
|
|
165923ebaf | ||
|
|
19d9875186 | ||
|
|
dfb10448e2 | ||
|
|
c5cd0c96f7 | ||
|
|
6fc37993fe | ||
|
|
23d08c0945 | ||
|
|
3c12ec8053 | ||
|
|
0b1625a798 | ||
|
|
a6982fe7f5 | ||
|
|
0949a2e639 | ||
|
|
85639a20fb | ||
|
|
c67458d189 | ||
|
|
5b1467af75 | ||
|
|
168de6fbc5 | ||
|
|
14735b470a | ||
|
|
22c8ffa2ba | ||
|
|
da2aebe3e6 | ||
|
|
5bc125d1d5 | ||
|
|
5be0c6850e | ||
|
|
f0cb627a8e | ||
|
|
5225697d9c | ||
|
|
903ad4d704 | ||
|
|
dcd79f2adb | ||
|
|
701304c164 | ||
|
|
03e138c349 | ||
|
|
64716b9622 | ||
|
|
b4b75ef682 | ||
|
|
fc0c98f5c0 | ||
|
|
c72a689f7f | ||
|
|
d95e6c61b5 | ||
|
|
1b7e4070f5 | ||
|
|
ceb18eeceb | ||
|
|
37295383ff | ||
|
|
98b7334209 | ||
|
|
a1bdea305b | ||
|
|
be42215003 | ||
|
|
8ce49ebea0 | ||
|
|
6cf850dd00 | ||
|
|
e9e48006dd | ||
|
|
c4baefff69 | ||
|
|
59ce7a9e19 | ||
|
|
a23dcec3d2 | ||
|
|
9169e8c36e | ||
|
|
88ae099102 | ||
|
|
30038b82a4 | ||
|
|
1eeeb41f3f | ||
|
|
201bdd0eff | ||
|
|
c212714cba | ||
|
|
8638d7b059 | ||
|
|
1ecd40d002 | ||
|
|
b4099e568a | ||
|
|
ea3b4a7315 | ||
|
|
1de030e2d0 | ||
|
|
ef4bcdb44f | ||
|
|
2bc72cde05 | ||
|
|
8cd20303ca | ||
|
|
11951a614c | ||
|
|
9dfa357770 | ||
|
|
0a24e781b2 | ||
|
|
821f11176f | ||
|
|
15d2136f5f | ||
|
|
5f5c8da61f | ||
|
|
7a33e738fa | ||
|
|
a09263f9d0 | ||
|
|
c2569c5de4 | ||
|
|
e674a7e2f3 | ||
|
|
b8b5272577 | ||
|
|
7005789427 | ||
|
|
dd52642d13 | ||
|
|
2aae91c3ed | ||
|
|
0d3419ecc4 | ||
|
|
b3262c28d6 | ||
|
|
4a20d8802e | ||
|
|
f21ebfb2ee | ||
|
|
69711ec322 | ||
|
|
8993abb9f1 | ||
|
|
6c0649ed9b | ||
|
|
7991e832a3 | ||
|
|
8548a9c621 | ||
|
|
78b405fd52 | ||
|
|
a0f5c0445e | ||
|
|
299a037564 | ||
|
|
8e9fa7a807 | ||
|
|
23c7599ab3 | ||
|
|
c10d7cc5f8 | ||
|
|
dba7bad836 | ||
|
|
bca6ca0237 | ||
|
|
faaf459388 | ||
|
|
a452b5ee7e | ||
|
|
9104cceedc | ||
|
|
100893dd33 | ||
|
|
56630b88a7 | ||
|
|
3f77ad8865 | ||
|
|
4453370768 | ||
|
|
a38f25f78b | ||
|
|
50e7887498 | ||
|
|
a86731afa9 | ||
|
|
2fb2d4e199 | ||
|
|
35d6717d6a | ||
|
|
c872a54675 | ||
|
|
b089a2b7ce | ||
|
|
216c85afe0 | ||
|
|
b75a131805 | ||
|
|
aaf5b34366 | ||
|
|
05000b1872 | ||
|
|
f112f9b830 | ||
|
|
0184570176 | ||
|
|
5e25040a97 | ||
|
|
bb191c1939 | ||
|
|
4a5f1df129 | ||
|
|
081832380c | ||
|
|
b11669a2eb | ||
|
|
aebbbd335e | ||
|
|
3366704c8f | ||
|
|
a71120ca8f | ||
|
|
68b3f3b3d6 | ||
|
|
3ad9b0d9fa | ||
|
|
e047558bee | ||
|
|
4b69204679 | ||
|
|
3026076ab5 | ||
|
|
762bfa7979 | ||
|
|
57831bb5c1 | ||
|
|
2e4c9236d6 | ||
|
|
3933bfdc57 | ||
|
|
fe7f04ebdf | ||
|
|
2c0574594d | ||
|
|
389efdcf14 | ||
|
|
1e6d7c8a40 | ||
|
|
d5f8446158 | ||
|
|
383b2a43df | ||
|
|
95311ab2d9 | ||
|
|
ca4e18c81f | ||
|
|
1eeff6c349 | ||
|
|
9e05d7ee03 | ||
|
|
55fac5dd74 | ||
|
|
d6615891c2 | ||
|
|
af9d44f91b | ||
|
|
156123520b | ||
|
|
33ea0aa4e7 | ||
|
|
9bbea8a2a1 | ||
|
|
882597d17e | ||
|
|
64ead8ea1c | ||
|
|
ab35c2d9ab | ||
|
|
affce710e2 | ||
|
|
a5e9b2e93e | ||
|
|
22a832f958 | ||
|
|
e954d364f5 | ||
|
|
0b4e32180b | ||
|
|
b3f38c4886 | ||
|
|
6ba88784a2 | ||
|
|
e64870df9c | ||
|
|
de602e3676 | ||
|
|
119fd9e1ad | ||
|
|
24efca8f4f | ||
|
|
9d02bf0868 | ||
|
|
45fe471b44 | ||
|
|
a8bd148683 | ||
|
|
ea89d6ec12 | ||
|
|
6ea8f2a2ae | ||
|
|
15282dde17 | ||
|
|
bdab318cc6 | ||
|
|
ea588a104c | ||
|
|
2b9faa8c7f | ||
|
|
562ab96b2f | ||
|
|
a1cc7f3fbd | ||
|
|
a8109a541d | ||
|
|
794c21484d | ||
|
|
7390538db0 | ||
|
|
559425cafa | ||
|
|
8fcc5cb349 | ||
|
|
3121f01f59 | ||
|
|
ffcc12de5f | ||
|
|
6c44c4795e | ||
|
|
27e2212ac0 | ||
|
|
2ed441fde7 | ||
|
|
66812106e8 | ||
|
|
24c5a45431 | ||
|
|
1f0bc8cff9 |
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
/doc/tags
|
||||
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
|
||||
Git wrapper of all time. Check out these features:
|
||||
@@ -11,13 +10,14 @@ 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.
|
||||
|
||||
Bring up the output of `git status` with `:Gstatus`. Use `-` to
|
||||
`add`/`reset` a file's changes, or `p` to `add`/`reset` `--patch` that
|
||||
mofo. And guess what `:Gcommit` does!
|
||||
Bring up the output of `git status` with `:Gstatus`. Press `-` to
|
||||
`add`/`reset` a file's changes, or `p` to `add`/`reset` `--patch`. And guess
|
||||
what `:Gcommit` does!
|
||||
|
||||
`: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
|
||||
commit, or `o` to open that commit in a split.
|
||||
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.
|
||||
|
||||
`:Gmove` does a `git mv` on a file and simultaneously renames the
|
||||
buffer. `:Gremove` does a `git rm` on a file and simultaneously deletes
|
||||
@@ -35,11 +35,90 @@ and you never get any warnings about the file changing outside Vim.
|
||||
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
|
||||
hosting provider, with optional line range (try it in visual mode!). Built-in
|
||||
support is provided for `git instaweb`, and plugins are available for popular
|
||||
providers such as [GitHub][rhubarb.vim], [GitLab][fugitive-gitlab.vim], and
|
||||
[Bitbucket][fubitive.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
|
||||
|
||||
Add `%{fugitive#statusline()}` to `'statusline'` to get an indicator
|
||||
with the current branch in (surprise!) your statusline.
|
||||
|
||||
Oh, and of course 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.
|
||||
|
||||
## Screencasts
|
||||
|
||||
* [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)
|
||||
|
||||
## Installation
|
||||
|
||||
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:
|
||||
|
||||
cd ~/.vim/bundle
|
||||
git clone git://github.com/tpope/vim-fugitive.git
|
||||
vim -u NONE -c "helptags vim-fugitive/doc" -c q
|
||||
|
||||
If your Vim version is below 7.2, I recommend also installing
|
||||
[vim-git](https://github.com/tpope/vim-git) for syntax highlighting and
|
||||
other Git niceties.
|
||||
|
||||
## FAQ
|
||||
|
||||
> I installed the plugin and started Vim. Why don't any of the commands
|
||||
> exist?
|
||||
|
||||
Fugitive cares about the current file, not the current working
|
||||
directory. Edit a file from the repository.
|
||||
|
||||
> I opened a new tab. Why don't any of the commands exist?
|
||||
|
||||
Fugitive cares about the current file, not the current working
|
||||
directory. Edit a file from the repository.
|
||||
|
||||
> Why is `:Gbrowse` not using the right browser?
|
||||
|
||||
`:Gbrowse` delegates to `git web--browse`, which is less than perfect
|
||||
when it comes to finding the right browser. You can tell it the correct
|
||||
browser to use with `git config --global web.browser ...`. On OS X, for
|
||||
example, you might want to set this to `open`. See `git web--browse --help`
|
||||
for details.
|
||||
|
||||
> Here's a patch that automatically opens the quickfix window after
|
||||
> `:Ggrep`.
|
||||
|
||||
This is a great example of why I recommend asking before patching.
|
||||
There are valid arguments to be made both for and against automatically
|
||||
opening the quickfix window. Whenever I have to make an arbitrary
|
||||
decision like this, I ask what Vim would do. And Vim does not open a
|
||||
quickfix window after `:grep`.
|
||||
|
||||
Luckily, it's easy to implement the desired behavior without changing
|
||||
fugitive.vim. The following autocommand will cause the quickfix window
|
||||
to open after any grep invocation:
|
||||
|
||||
autocmd QuickFixCmdPost *grep* cwindow
|
||||
|
||||
## Self-Promotion
|
||||
|
||||
Like fugitive.vim? Follow the repository on
|
||||
[GitHub](http://github.com/tpope/vim-fugitive) and vote for it on
|
||||
[vim.org](http://www.vim.org/scripts/script.php?script_id=2975).
|
||||
[GitHub](https://github.com/tpope/vim-fugitive) and vote for it on
|
||||
[vim.org](http://www.vim.org/scripts/script.php?script_id=2975). And if
|
||||
you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
|
||||
[Twitter](http://twitter.com/tpope) and
|
||||
[GitHub](https://github.com/tpope).
|
||||
|
||||
## License
|
||||
|
||||
Copyright (c) Tim Pope. Distributed under the same terms as Vim itself.
|
||||
See `:help license`.
|
||||
|
||||
235
doc/fugitive.txt
235
doc/fugitive.txt
@@ -1,38 +1,14 @@
|
||||
*fugitive.txt* A Git wrapper so awesome, it should be illegal
|
||||
|
||||
Author: Tim Pope <vimNOSPAM@tpope.info> *fugitive-author*
|
||||
Author: Tim Pope <http://tpo.pe/>
|
||||
License: Same terms as Vim itself (see |license|)
|
||||
|
||||
This plugin is only available if 'compatible' is not set.
|
||||
|
||||
INTRODUCTION *fugitive*
|
||||
|
||||
Install in ~/.vim, or in ~\vimfiles if you're on Windows and feeling lucky.
|
||||
Vim 7.2 is recommended as it ships with syntax highlighting for many Git file
|
||||
types.
|
||||
|
||||
If you're in a hurry to get started, here are some things to try:
|
||||
|
||||
In any file in your repository, run |:Gedit| HEAD. Press <CR> to jump to the
|
||||
current branch. Press <CR> again to jump to the top most commit. Keep using
|
||||
<CR> to explore parent commits, trees, and blobs. Use C in a tree or blob to
|
||||
get back to the commit.
|
||||
|
||||
Edit a file in the work tree and make some changes. Use |:Gdiff| to open up
|
||||
the indexed version. Use |do| and |dp| on various hunks to bring the files in
|
||||
sync, or use |:Gread| to pull in all changes. Write the indexed version to
|
||||
stage the file.
|
||||
|
||||
Run |:Gstatus| to check your repository's status. Use "-" to stage and reset
|
||||
files and "p" to add/reset --patch them. Invoke |:Gcommit| to commit your
|
||||
changes.
|
||||
|
||||
Run |:Gblame| in a work tree file to see a blame in a vertical split. Press
|
||||
<CR> on any line to reopen and reblame that file as it stood in that commit.
|
||||
Press o or O on any line to inspect that commit in a split or a tab.
|
||||
|
||||
Run |:Ggrep| to search the work tree or history. Run |:Gmove| to rename a
|
||||
file. Run |:Gremove| to delete a file.
|
||||
Whenever you edit a file from a Git repository, a set of commands is defined
|
||||
that serve as a gateway to Git.
|
||||
|
||||
COMMANDS *fugitive-commands*
|
||||
|
||||
@@ -43,6 +19,10 @@ that are part of Git repositories).
|
||||
:Git [args] Run an arbitrary git command. Similar to :!git [args]
|
||||
but chdir to the repository tree first.
|
||||
|
||||
*fugitive-:Git!*
|
||||
:Git! [args] Like |:Git|, but capture the output into a temp file,
|
||||
and edit that temp file.
|
||||
|
||||
*fugitive-:Gcd*
|
||||
:Gcd [directory] |:cd| relative to the repository.
|
||||
|
||||
@@ -51,32 +31,91 @@ that are part of Git repositories).
|
||||
|
||||
*fugitive-:Gstatus*
|
||||
:Gstatus Bring up the output of git-status in the preview
|
||||
window. Press D to |:Gdiff| the file on the cursor
|
||||
line. Press - to stage or unstage the file on the
|
||||
cursor line. Press p to do so on a per hunk basis
|
||||
(--patch). Press C to invoke |:Gcommit|.
|
||||
window. The following maps, which work on the cursor
|
||||
line file where sensible, are provided:
|
||||
|
||||
g? show this help
|
||||
<C-N> next file
|
||||
<C-P> previous file
|
||||
<CR> |:Gedit|
|
||||
- |:Git| add
|
||||
- |:Git| reset (staged files)
|
||||
cA |:Gcommit| --amend --reuse-message=HEAD
|
||||
ca |:Gcommit| --amend
|
||||
cc |:Gcommit|
|
||||
cva |:Gcommit| --amend --verbose
|
||||
cvc |:Gcommit| --verbose
|
||||
D |:Gdiff|
|
||||
ds |:Gsdiff|
|
||||
dp |:Git!| diff (p for patch; use :Gw to apply)
|
||||
dp |:Git| add --intent-to-add (untracked files)
|
||||
dv |:Gvdiff|
|
||||
O |:Gtabedit|
|
||||
o |:Gsplit|
|
||||
p |:Git| add --patch
|
||||
p |:Git| reset --patch (staged files)
|
||||
q close status
|
||||
r reload status
|
||||
S |:Gvsplit|
|
||||
U |:Git| checkout
|
||||
U |:Git| checkout HEAD (staged files)
|
||||
U |:Git| clean (untracked files)
|
||||
U |:Git| rm (unmerged files)
|
||||
|
||||
*fugitive-:Gcommit*
|
||||
:Gcommit [args] A wrapper around git-commit. If there is nothing
|
||||
to commit, |:Gstatus| is called instead. Unless the
|
||||
arguments given would skip the invocation of an editor
|
||||
(e.g., -m), a split window will be used to obtain a
|
||||
commit message. Write and close that window (:wq or
|
||||
|:Gwrite|) to finish the commit. Unlike when running
|
||||
the actual git-commit command, it is possible (but
|
||||
unadvisable) to muck with the index with commands like
|
||||
git-add and git-reset while a commit message is
|
||||
pending.
|
||||
commit message, or a new tab if -v is given. Write
|
||||
and close that window (:wq or |:Gwrite|) to finish the
|
||||
commit. Unlike when running the actual git-commit
|
||||
command, it is possible (but unadvisable) to alter the
|
||||
index with commands like git-add and git-reset while a
|
||||
commit message is pending.
|
||||
|
||||
*fugitive-:Gmerge*
|
||||
:Gmerge [args] Calls git-merge and loads errors and conflicted files
|
||||
into the quickfix list. Opens a |:Gcommit| style
|
||||
split window for the commit message if the merge
|
||||
succeeds. If called during a merge conflict, the
|
||||
conflicted files from the current index are loaded
|
||||
into the quickfix list.
|
||||
|
||||
*fugitive-:Gpull*
|
||||
:Gpull [args] Like |:Gmerge|, but for git-pull.
|
||||
|
||||
*fugitive-:Gpush*
|
||||
:Gpush [args] Invoke git-push, load the results into the quickfix
|
||||
list, and invoke |:cwindow| to reveal any errors.
|
||||
|:Dispatch| is used if available for asynchronous
|
||||
invocation.
|
||||
|
||||
*fugitive-:Gfetch*
|
||||
:Gfetch [args] Like |:Gpush|, but for git-fetch.
|
||||
|
||||
*fugitive-:Ggrep*
|
||||
:Ggrep [args] |:grep| with git-grep as 'grepprg'.
|
||||
:Ggrep[!] [args] |:grep|[!] with git-grep as 'grepprg'.
|
||||
|
||||
*fugitive-:Glgrep*
|
||||
:Glgrep[!] [args] |:lgrep|[!] with git-grep as 'grepprg'.
|
||||
|
||||
*fugitive-:Glog*
|
||||
:Glog [args] Load all previous revisions of the current file into
|
||||
the quickfix list. Additional git-log arguments can
|
||||
be given (for example, --reverse). If "--" appears as
|
||||
an argument, no file specific filtering is done, and
|
||||
commits are loaded into the quickfix list.
|
||||
previous commits rather than previous file revisions
|
||||
are loaded.
|
||||
|
||||
:{range}Glog [args] Use git-log -L to load previous revisions of the given
|
||||
range of the current file into the quickfix list. The
|
||||
cursor is positioned on the first line of the first
|
||||
diff hunk for each commit.
|
||||
|
||||
*fugitive-:Gllog*
|
||||
:Gllog [args] Like |:Glog|, but use the location list instead of the
|
||||
quickfix list.
|
||||
|
||||
*fugitive-:Gedit* *fugitive-:Ge*
|
||||
:Gedit [revision] |:edit| a |fugitive-revision|.
|
||||
@@ -88,10 +127,15 @@ that are part of Git repositories).
|
||||
:Gvsplit [revision] |:vsplit| a |fugitive-revision|.
|
||||
|
||||
*fugitive-:Gtabedit*
|
||||
:Gtabedit [revision] |:tabedit| a |fugitive-revision|
|
||||
:Gtabedit [revision] |:tabedit| a |fugitive-revision|.
|
||||
|
||||
*fugitive-:Gpedit*
|
||||
:Gpedit [revision] |:pedit| a |fugitive-revision|
|
||||
:Gpedit [revision] |:pedit| a |fugitive-revision|.
|
||||
|
||||
:Gsplit! [args] *fugitive-:Gsplit!* *fugitive-:Gvsplit!*
|
||||
:Gvsplit! [args] *fugitive-:Gtabedit!* *fugitive-:Gpedit!*
|
||||
:Gtabedit! [args] Like |:Git!|, but open the resulting temp file in a
|
||||
:Gpedit! [args] split, tab, or preview window.
|
||||
|
||||
*fugitive-:Gread*
|
||||
:Gread [revision] Empty the buffer and |:read| a |fugitive-revision|.
|
||||
@@ -103,9 +147,12 @@ that are part of Git repositories).
|
||||
|:read| in a |fugitive-revision| after {range}.
|
||||
|
||||
*fugitive-:Gread!*
|
||||
:Gread! [revision] Deprecated synonym for |:Gread|.
|
||||
:Gread! [args] Empty the buffer and |:read| the output of a Git
|
||||
command. For example, :Gread! show HEAD:%.
|
||||
|
||||
*fugitive-:Gwrite*
|
||||
:{range}Gread! [args] |:read| the output of a Git command after {range}.
|
||||
|
||||
*fugitive-:Gw* *fugitive-:Gwrite*
|
||||
:Gwrite Write to the current file's path and stage the results.
|
||||
When run in a work tree file, it is effectively git
|
||||
add. Elsewhere, it is effectively git-checkout. A
|
||||
@@ -118,14 +165,31 @@ that are part of Git repositories).
|
||||
:0:foo.txt or even :0 to write to just that stage in
|
||||
the index.
|
||||
|
||||
*fugitive-:Gwq*
|
||||
:Gwq [path] Like |:Gwrite| followed by |:quit| if the write
|
||||
succeeded.
|
||||
|
||||
:Gwq! [path] Like |:Gwrite|! followed by |:quit|! if the write
|
||||
succeeded.
|
||||
|
||||
*fugitive-:Gdiff*
|
||||
:Gdiff [revision] Perform a |vimdiff| against the current file in the
|
||||
given revision. With no argument, the version in the
|
||||
index is used (which means a three-way diff during a
|
||||
merge conflict, making it a git-mergetool
|
||||
alternative). The newer of the two files is placed
|
||||
to the right. Use |do| and |dp| and write to the
|
||||
index file to simulate "git add --patch".
|
||||
to the right or bottom, depending on 'diffopt' and
|
||||
the width of the window relative to 'textwidth'. Use
|
||||
|do| and |dp| and write to the index file to simulate
|
||||
"git add --patch". For the three-way diff, there is
|
||||
also d2o and d3o pulling the hunk to the middle from
|
||||
the left or the right window, respectively.
|
||||
|
||||
*fugitive-:Gsdiff*
|
||||
:Gsdiff [revision] Like |:Gdiff|, but always split horizontally.
|
||||
|
||||
*fugitive-:Gvdiff*
|
||||
:Gvdiff [revision] Like |:Gdiff|, but always split vertically.
|
||||
|
||||
*fugitive-:Gmove*
|
||||
:Gmove {destination} Wrapper around git-mv that renames the buffer
|
||||
@@ -141,15 +205,71 @@ that are part of Git repositories).
|
||||
|
||||
*fugitive-:Gblame*
|
||||
:Gblame [flags] Run git-blame on the file and open the results in a
|
||||
scroll bound vertical split. Press enter on a line to
|
||||
reblame the file as it was in that commit. You can
|
||||
give any of ltwfsMC as flags and they will be passed
|
||||
along to git-blame.
|
||||
scroll bound vertical split. You can give any of
|
||||
ltfnsewMC as flags and they will be passed along to
|
||||
git-blame. The following maps, which work on the
|
||||
cursor line commit where sensible, are provided:
|
||||
|
||||
g? show this help
|
||||
A resize to end of author column
|
||||
C resize to end of commit column
|
||||
D resize to end of date/time column
|
||||
q close blame and return to blamed window
|
||||
gq q, then |:Gedit| to return to work tree version
|
||||
<CR> q, then open commit
|
||||
o open commit in horizontal split
|
||||
O open commit in new tab
|
||||
- reblame at commit
|
||||
~ reblame at [count]th first grandparent
|
||||
P reblame at [count]th parent (like HEAD^[count])
|
||||
|
||||
:[range]Gblame [flags] Run git-blame on the given range.
|
||||
|
||||
*fugitive-:Gbrowse*
|
||||
:Gbrowse Open the current file, blob, tree, commit, or tag
|
||||
in your browser at the upstream hosting provider.
|
||||
If a range is given, it is appropriately appended to
|
||||
the URL as an anchor.
|
||||
|
||||
Upstream providers can be added by installing an
|
||||
appropriate Vim plugin. For example, GitHub can be
|
||||
supported by installing rhubarb.vim, available at
|
||||
<https://github.com/tpope/vim-rhubarb>.
|
||||
|
||||
The hosting provider is determined by looking at the
|
||||
remote for the current or specified branch and falls
|
||||
back to "origin". In the special case of a "."
|
||||
remote, a local instance of git-instaweb will be
|
||||
started and used.
|
||||
|
||||
:Gbrowse {revision} Like :Gbrowse, but for a given |fugitive-revision|. A
|
||||
useful value here is -, which ties the URL to the
|
||||
latest commit rather than a volatile branch.
|
||||
|
||||
:Gbrowse [...]@{remote} Force using the given remote rather than the remote
|
||||
for the current branch. The remote is used to
|
||||
determine which GitHub repository to link to.
|
||||
|
||||
:{range}Gbrowse [args] Appends an anchor to the URL that emphasizes the
|
||||
selected lines. You almost certainly want to give a
|
||||
"-" argument in this case to force the URL to include
|
||||
an exact revision.
|
||||
|
||||
:[range]Gbrowse! [args] Like :Gbrowse, but put the URL on the clipboard rather
|
||||
than opening it.
|
||||
|
||||
MAPPINGS *fugitive-mappings*
|
||||
|
||||
These maps are available everywhere.
|
||||
|
||||
*fugitive-c_CTRL-R_CTRL-G*
|
||||
<C-R><C-G> On the command line, recall the path to the current
|
||||
object (that is, a representation of the object
|
||||
recognized by |:Gedit|).
|
||||
|
||||
*fugitive-y_CTRL-G*
|
||||
["x]y<C-G> Yank the commit SHA and path to the current object.
|
||||
|
||||
These maps are available in Git objects.
|
||||
|
||||
*fugitive-<CR>*
|
||||
@@ -158,9 +278,16 @@ These maps are available in Git objects.
|
||||
*fugitive-o*
|
||||
o Jump to the revision under the cursor in a new split.
|
||||
|
||||
*fugitive-S*
|
||||
S Jump to the revision under the cursor in a new
|
||||
vertical split.
|
||||
|
||||
*fugitive-O*
|
||||
O Jump to the revision under the cursor in a new tab.
|
||||
|
||||
*fugitive--*
|
||||
- Go to the tree containing the current tree or blob.
|
||||
|
||||
*fugitive-~*
|
||||
~ Go to the current file in the [count]th first
|
||||
ancestor.
|
||||
@@ -171,6 +298,10 @@ P Go to the current file in the [count]th parent.
|
||||
*fugitive-C*
|
||||
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*
|
||||
a Show the current tag, commit, or tree in an alternate
|
||||
format.
|
||||
@@ -211,6 +342,12 @@ a statusline, this one matches the default when 'ruler' is set:
|
||||
>
|
||||
set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
|
||||
<
|
||||
*fugitive#head(...)*
|
||||
Use fugitive#head() to return the name of the current branch. If the current
|
||||
HEAD is detached, fugitive#head() will return the empty string, unless the
|
||||
optional argument is given, in which case the hash of the current commit will
|
||||
be truncated to the given number of characters.
|
||||
|
||||
ABOUT *fugitive-about*
|
||||
|
||||
Grab the latest version or report a bug on GitHub:
|
||||
|
||||
2310
plugin/fugitive.vim
2310
plugin/fugitive.vim
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user