Commit Graph

631 Commits

Author SHA1 Message Date
Tim Pope
dff9b92cde Fix status reload after rename
Closes #354.
2014-06-21 11:28:46 -04:00
Tim Pope
419f1ee910 Fix :Gcommit -c
Closes #356.
2014-06-21 11:19:59 -04:00
Tim Pope
e3904723f8 Keep alternate file on :Gdiff
Closes #357.
2014-06-21 11:17:59 -04:00
Tim Pope
652c27a46b Use 'shellslash' to detect Windows shell 2014-06-21 11:14:51 -04:00
Tim Pope
336c716ba0 Encapsulate Windows shell conditional 2014-06-21 11:13:21 -04:00
Tim Pope
585fcc8a9b Use netrw not web--browse to invoke browser
Closes #411.
2014-06-21 10:30:20 -04:00
Tim Pope
4b75c7bff2 Enforce foldmethod=syntax in commits
Closes #432.
2014-06-21 10:25:30 -04:00
Tim Pope
b0bc71460a :.Glog adds current line number to each entry
Closes #286.
2014-06-21 10:18:41 -04:00
Tim Pope
061a81f247 Provide checkout/unlink on U in :Gstatus
Closes #97.
2014-06-21 10:05:46 -04:00
Tim Pope
15fbbf7296 Prefer :Gdiff to :Gvdiff for D in :Gstatus 2014-06-21 09:37:51 -04:00
Tim Pope
64c690603e Change reload map to r 2014-06-21 09:33:59 -04:00
Eric Christopherson
269c89ef59 Ignore E302 "Could not rename swap file" error
According to `:help E302`, E302 comes from Vim being unable to rename
the swap file when an open buffer's name is changed; but the error is
mostly harmless. E302 seems to occur in vim-fugitive under Windows but
not *nix.

This fix allow :Glog and :Gdiff to work on such systems; previously the
uncaught error made these operations fail or at least work strangely.
2014-06-21 09:08:49 -04:00
Tim Pope
e6e259c2d2 Change section heading style 2014-06-21 08:48:11 -04:00
Bastian Winkler
3e3a899cf1 Restore 'foldenable' setting when diff ends
After finishing a diff session, the foldenable settings should be
restored to it's previous value.
2014-06-21 08:44:50 -04:00
Tim Pope
cad80493f4 Account for third window width in merge diff 2014-06-21 08:35:58 -04:00
Tim Pope
aed0043a1f Include foldcolumn in diff width calculation 2014-06-21 08:27:36 -04:00
Tim Pope
c5a3c5f8ce Smart choice of vertical or horizontal diff 2014-06-21 08:18:46 -04:00
Tim Pope
0a19a3e78f Fix untracked false positive on unmerged files
References #440.
2014-06-20 07:52:34 -04:00
Tim Pope
7fd14b218e Fix version number 2014-06-20 07:52:28 -04:00
Tim Pope
99809a021c Don't gratuitously clobber quickfix in :Ggrep 2014-06-19 16:40:26 -04:00
Tim Pope
2b05b275f5 Simplify tab completion 2014-06-17 02:30:30 -04:00
Tim Pope
c4713200f7 Cleaner :Git commands 2014-06-11 03:30:27 -04:00
Caleb Thompson
545578538c Override status.short configuration
Git allows the "status.short" configuration to implicitly pass `--short`
to git-status. Override that value so that we see "long" status format.
2014-06-10 23:28:53 -04:00
Tim Pope
6f5fd2add0 Fix fold opening 2014-06-10 18:46:04 -04:00
Tim Pope
416165f063 Check correct window for 'diff' on BufWinLeave
Closes #493.
2014-05-30 14:26:40 -04:00
Daniel Harding
f8bf95b9ff Fix Gblame problems on Windows
On Windows, if Vim is invoked with a working directory starting with a
lowercase drive letter (e.g. c:\<path> instead of C:\<path>), some
mappings in the blame buffer do not work correctly.  For example,
hitting Enter on a line throws an exception rather than showing the
associated commit.  The reason for this is that the b:git_dir variable
is not being set on the blame buffer.  The reason in turn for this is
that the path to the blame buffer is being stored in s:temp_files with
an uppercase drive letter, but in the fugitive_temp augroup, '<afile>:p'
is being expanded with a lowercase drive letter, so the lookup in
s:temp_files fails.  Fix this by converting paths to lowercase before
using them as keys for the s:tempfile dictionary.  Because of the way
Vim generates temporary file names, this is safe even on platforms with
case-sensitive file systems.
2014-05-12 13:59:35 -04:00
Daniel Harding
46ca7374f0 Fix Gblame documentation
Remove an incorrect sentence about what happens when enter is pressed in
the blame buffer.
2014-05-09 14:49:23 -04:00
Tim Pope
c99f0ff06b Restore ridiculous hack to set cursor position on :Gdiff
This time with :setlocal.

Closes #471.  References #475.
2014-04-14 13:34:37 -04:00
Tim Pope
07c58226df Revert "Ridiculous hack to set cursor position on :Gdiff"
This reverts commit c8070aec7e.

Closes #471.
2014-04-13 18:11:25 -04:00
Tim Pope
4f80883e05 Limit scope of ctrlp.vim :Gstatus hack 2014-04-10 14:53:49 -04:00
Tim Pope
bf14c9c8a3 Drop support for CtrlP in history
This is fairly straightforward to do outside of fugitive.vim, and
there's no reason to give it privileged treatment here.

Closes #403.
2014-04-10 14:52:47 -04:00
Tim Pope
e7c7149434 Map both g? and <F1> to show help
Closes #273.
2014-04-07 05:00:41 -04:00
Tim Pope
c8070aec7e Ridiculous hack to set cursor position on :Gdiff
References #429.
2014-04-07 03:52:31 -04:00
Tim Pope
21b60b309d Support implicit github username in remote
Closes #466.
2014-04-02 18:09:33 -04:00
Tim Pope
9649b02076 Fix modeline errors in historical buffers
Our doautocmd in s:ReplaceCmd already processes the modelines while the
buffer is still modifiable, so we can disable it after tha prevent
subsequent invocations.

Closes #323.
2014-04-02 02:32:20 -04:00
Tim Pope
cbab574164 Make commands available in command line window
Closes #325.
2014-04-02 02:14:32 -04:00
Tim Pope
72d382077c Revert "Work around issue using buffer number rather than name"
This reverts commit d6540b2588, which
caused all sorts of breakages with buffer names with brackets in them.
This was greatly exacerbated by airline.vim setting an erroneous
b:git_dir in plugin buffers based on the current working directory.

Closes #464. Closes #463. Closes #461.
2014-04-01 19:02:15 -04:00
Tim Pope
17393f552e Don't blow up on type checking empty buffers
Closes #462.
2014-03-31 19:14:57 -04:00
Craig Main
51cdb1b190 Cater for powershell as well as cmd for windows users 2014-03-31 02:33:44 -04:00
Tim Pope
c1664de7b4 Don't blow up on vanishing HEAD
Closes #459.
2014-03-30 13:14:00 -04:00
Tim Pope
d6540b2588 Work around issue using buffer number rather than name
Observed on the OS X Mavericks install of Vim 7.3.
2014-03-27 18:01:06 -04:00
Tim Pope
22cc877e64 Add missing aborts 2014-03-27 17:22:35 -04:00
Tim Pope
218fc37ce1 Revert "Work around more 'wildignore' silliness"
This reverts commit 3bfa0a2725.

Closes #457.
2014-03-27 17:21:29 -04:00
Tim Pope
3bfa0a2725 Work around more 'wildignore' silliness 2014-03-26 14:25:44 -04:00
Tim Pope
fd297ad11f Set winfixwidth
Closes #453.
2014-03-25 13:37:57 -04:00
Tim Pope
a069fa7066 Accidental omission from previous commit 2014-03-25 13:37:19 -04:00
Tim Pope
d6f17608dd Support :Gcommit --patch
Closes #452.
2014-03-20 13:21:19 -04:00
Tim Pope
70ec927890 Improve keepjumps situation 2014-03-19 23:36:20 -04:00
Tim Pope
b27937d5e4 Turn off swap files in all URL buffers
References #202.
2014-03-19 00:53:05 -04:00
Daniel Hahler
152c9195ae Check &diff first in fugitive_diff autocmds
This avoids calling `s:diff_window_count` in the common (non-diff) case.
2014-03-13 15:48:20 -04:00