Commit Graph

321 Commits

Author SHA1 Message Date
Tim Pope
168de6fbc5 Don't wipe status buffer
This was to address #105, but the annoyance factor is too high to
justify keeping it.
2012-03-12 18:36:16 -04:00
Tim Pope
14735b470a Use y<C-G> to yank the current object's path
In response to #165.
2012-03-10 17:40:21 -05:00
Tim Pope
22c8ffa2ba Hack around broken :Gcommit with symlinked .git 2012-03-08 11:40:23 -05:00
Tim Pope
da2aebe3e6 Use ==# 2012-03-05 07:32:01 -05:00
Tim Pope
5bc125d1d5 Try harder not to choke on broken modeline
Partially addresses #162.
2012-03-05 07:27:35 -05:00
Tim Pope
5be0c6850e Don't abort s:ReplaceCmd on modeline error
Partially addresses #162.
2012-03-05 07:11:13 -05:00
Tim Pope
f0cb627a8e Really turn off modelines in commits and :Gstatus
Partially addresses #162.
2012-03-05 06:58:00 -05:00
Tim Pope
5225697d9c Revert "Use --work-tree to fix :cd side effects in :Gcommit"
This reverts commit 903ad4d704, which
broke :Gcommit when invoked from a subdirectory of the repository.
2012-03-03 10:08:00 -05:00
Tim Pope
903ad4d704 Use --work-tree to fix :cd side effects in :Gcommit
Closes #155
2012-03-03 03:30:27 -05:00
Tim Pope
dcd79f2adb Map cv to :Gcommit -v 2012-03-01 03:34:30 -05:00
Tim Pope
701304c164 Work around .git in 'wildignore'
Closes #119.
2012-03-01 02:47:13 -05:00
Tim Pope
03e138c349 Attempt to address more Windows slowness (#150) 2012-02-08 13:03:10 -05:00
Taylor Hedberg
64716b9622 :Gblame: Retain original alternate buffer 2012-01-24 12:07:56 -05:00
sgur
b4b75ef682 Work around slow \\ Windows network path 2011-12-09 23:06:04 -05:00
Daniel Hahler
fc0c98f5c0 Check for +cursorbind feature before using it
`+cursorbind` is not available with Vim on RHEL 6.1 for example.
2011-12-06 12:46:07 -05:00
Tim Pope
c72a689f7f Restore 'cursorbind' after diff
Closes #122.
2011-12-03 01:10:08 -05:00
Tim Pope
d95e6c61b5 Disable swapfile in :Gstatus 2011-11-27 12:56:44 -05:00
Tim Pope
1b7e4070f5 Fix bare repository support
Closes #117.
2011-10-08 16:09:00 -04:00
Tim Pope
ceb18eeceb Fix issue with symlinked tmp dir 2011-10-07 01:33:51 -04:00
Tim Pope
37295383ff Provide fugitive#repo() 2011-10-04 20:25:32 -04:00
Tim Pope
98b7334209 Close old blame windows before new blame 2011-10-04 03:13:46 -04:00
Tim Pope
a1bdea305b Fix restore from blame
Options affected by blame are now restored when the blame window is
closed while not focused.
2011-10-04 03:10:04 -04:00
Tim Pope
be42215003 Enter on a +/- diff line jumps to that line
This is useful particularly in conjunction with :Gblame.  Press `i` on a
line in a blame to open the commit.  If the diff reveals a new point of
interest, press enter on that line to jump to it in the history, then
:Gblame again.
2011-10-01 17:31:57 -04:00
Tim Pope
8ce49ebea0 Jump from blame to commit focuses relevant diff 2011-10-01 17:31:57 -04:00
Tim Pope
e9e48006dd Fix :Gblame scrollbind with folds 2011-10-01 17:31:57 -04:00
Tim Pope
c4baefff69 Press i in blame to close then jump to commit 2011-10-01 04:23:27 -04:00
Tim Pope
59ce7a9e19 Restore blamed window on gq in blame 2011-10-01 04:13:09 -04:00
Tim Pope
a23dcec3d2 Return to blamed buffer on q in blame 2011-10-01 04:02:29 -04:00
Tim Pope
9169e8c36e Remove space from q map 2011-10-01 03:54:58 -04:00
Tim Pope
88ae099102 Syntax fix 2011-10-01 02:31:53 -04:00
Tim Pope
30038b82a4 Fix jump to line on reblame
Discovered when investigating #112.
2011-10-01 02:26:26 -04:00
Tim Pope
1eeeb41f3f Work around git.vim's broken b:git_dir 2011-09-24 18:31:23 -04:00
Tim Pope
201bdd0eff Fix completion of :Gedit! 2011-09-12 17:02:45 -04:00
Tim Pope
c212714cba :Gwrite in a patch to apply it
Closes #106.
2011-09-08 17:13:00 -04:00
Tim Pope
8638d7b059 Clever window size on :Gcommit from :Gstatus 2011-09-05 21:17:19 -04:00
Tim Pope
1ecd40d002 Revert "Partial workaround for symlinked .git"
This reverts commit ea3b4a7315.
b4099e568a handles this more cleanly.
2011-09-02 15:19:06 -04:00
Tim Pope
b4099e568a Wipe :Gstatus on closure
References #105
2011-09-02 14:59:30 -04:00
Tim Pope
ea3b4a7315 Partial workaround for symlinked .git
Closes #105
2011-09-02 14:56:49 -04:00
Tim Pope
1de030e2d0 Treat . remote as origin in :Gbrowse 2011-08-29 20:56:21 -04:00
Tim Pope
ef4bcdb44f Add cc alias for C in :Gstatus 2011-08-29 20:50:05 -04:00
Tim Pope
8cd20303ca Escape ! in :Gblame filename 2011-08-25 20:24:01 -04:00
Tim Pope
11951a614c Identify new buffers as "file" 2011-08-25 20:23:47 -04:00
Tim Pope
9dfa357770 :Ge in blank buffer goes to status 2011-08-25 19:08:23 -04:00
Tim Pope
0a24e781b2 Allow exiting vim from q in sole buffer :Gstatus 2011-08-25 19:07:50 -04:00
Tim Pope
821f11176f Add ca and cA commit maps to :Gstatus 2011-08-25 15:45:00 -04:00
Tim Pope
15d2136f5f Kill relativenumber in blame buffer
Closes #102
2011-08-25 14:51:48 -04:00
Tim Pope
5f5c8da61f Fix several editing maps 2011-08-21 15:53:12 -04:00
Tim Pope
7a33e738fa Tab complete Git aliases 2011-08-21 13:55:04 -04:00
Tim Pope
a09263f9d0 Fix jump after dp on untracked file 2011-08-21 13:45:21 -04:00
Tim Pope
c2569c5de4 Support space and comma paths with tags 2011-08-19 21:15:15 -04:00
Tim Pope
e674a7e2f3 Map dp to show diff in :Gstatus
Closes #101
2011-08-19 18:21:58 -04:00
Tim Pope
7005789427 Add :Git! et al. for loading output into a buffer 2011-08-19 15:01:56 -04:00
Tim Pope
dd52642d13 Document :Gstatus maps in tabular form 2011-08-19 15:01:56 -04:00
Tim Pope
2aae91c3ed Map R to reload :Gstatus 2011-08-19 14:30:40 -04:00
Tim Pope
0d3419ecc4 Always map q in status 2011-08-19 14:08:56 -04:00
Tim Pope
b3262c28d6 No preview window business for :Gread 2011-08-19 03:04:50 -04:00
Tim Pope
4a20d8802e Handle return to temp files more gracefully 2011-08-19 03:04:50 -04:00
Tim Pope
f21ebfb2ee Make <C-R><C-G> a noop on irrelevant :Gstatus line 2011-08-19 03:04:50 -04:00
Tim Pope
8993abb9f1 Set bufhidden=delete in historical buffers 2011-08-15 23:17:42 -04:00
Tim Pope
6c0649ed9b Fix redraw issue after :Gbrowse 2011-08-12 17:50:58 -04:00
Tim Pope
7991e832a3 Prioritize our own tags 2011-08-11 11:03:18 -04:00
Tim Pope
8548a9c621 <C-R><C-G> in Gstatus recalls cursor line filename 2011-08-09 15:16:17 -04:00
Tim Pope
78b405fd52 Support core.autocrlf=false on Windows
Fixes #99.
2011-08-09 11:18:50 -04:00
Tim Pope
a0f5c0445e Restore options when turning off diff mode 2011-08-07 19:53:03 -04:00
Tim Pope
299a037564 Rename confusing w:fugitive_restore 2011-08-07 19:51:45 -04:00
Tim Pope
c10d7cc5f8 Reference homepage not email 2011-08-06 16:55:57 -04:00
Tim Pope
4453370768 Fix trailing blank line when editing index files
I can't consistently reproduce this, but a binary write is the logical
thing to do in this case, and seems to work.
2011-06-13 22:38:13 -04:00
Tim Pope
a38f25f78b Close diffs when navigating from :Gstatus 2011-06-12 23:10:06 -04:00
Tim Pope
35d6717d6a Work around "always" color option 2011-05-27 14:51:18 -04:00
Tim Pope
c872a54675 Fix :Gcommit % 2011-05-10 08:31:41 -04:00
Tim Pope
b089a2b7ce Fix :Gcommit on csh and Windows 2011-05-09 20:02:30 -04:00
Tim Pope
216c85afe0 Fix history browsing on csh and Windows 2011-05-09 13:31:19 -04:00
Tim Pope
b75a131805 Drop noautowrite rendered irrelevant by system() 2011-05-09 13:07:39 -04:00
Tim Pope
aaf5b34366 Fix garbling on :Gcommit when nothing is staged
Fixes #68.
2011-05-09 08:37:24 -04:00
Tim Pope
05000b1872 Fix garbage during :Gcommit with alternate screen
When running Vim in a terminal with an alternate screen buffer, :Gcommit
trashes the screen in a way that requires a redraw to fix.  Circumvent
this by using system() rather than `silent !`.  Fixes #68.
2011-05-09 01:27:15 -04:00
Tim Pope
f112f9b830 fugitive.vim 1.2 2011-04-28 23:36:12 -04:00
Tim Pope
0184570176 Revert "Preserve alternate file in :Gmove"
This reverts commit 68b3f3b3d6.  Since
:saveas changes the alternate file, :Gmove should too.
2011-04-28 21:23:47 -04:00
Tim Pope
5e25040a97 Support "(modified content, untracked content)" 2011-04-26 08:44:49 -04:00
Tim Pope
bb191c1939 Really work around Vim parser idiosyncrasy 2011-04-26 08:35:02 -04:00
Tim Pope
4a5f1df129 Fix closing of status window in :Gcommit 2011-04-25 15:17:19 -04:00
Tim Pope
081832380c Work around Vim parser idiosyncrasy 2011-04-25 15:14:55 -04:00
Tim Pope
b11669a2eb Perform automatic :diffupdate after conflict dp 2011-04-25 14:32:42 -04:00
Tim Pope
aebbbd335e Map dp in stage conflict to do the right thing 2011-04-25 11:50:19 -04:00
Tim Pope
3366704c8f Enable - on headings in :Gstatus 2011-04-23 22:15:28 -04:00
Tim Pope
a71120ca8f Cope with new "Changes not staged" heading 2011-04-23 22:06:30 -04:00
Tim Pope
68b3f3b3d6 Preserve alternate file in :Gmove 2011-04-22 13:06:27 -04:00
Tim Pope
3ad9b0d9fa Don't clobber alternate file when committing 2011-04-22 12:59:03 -04:00
Tim Pope
e047558bee Support :Gcommit on older Git versions 2011-04-19 18:24:33 -04:00
Daniel Hahler
4b69204679 Handle non-readable .git dirs.
This can happen when a normal user edits/views some files in /etc, which
is maintained using git/etckeeper, and /etc/.git is only readable by
root.
2011-04-18 03:27:28 -04:00
Tim Pope
3026076ab5 Simplify csh special cases 2011-04-04 23:15:19 -04:00
Alexander Kahn
762bfa7979 Use https for GitHub URL 2011-03-08 05:23:45 +08:00
Tim Pope
2e4c9236d6 Implement :Gwq 2011-02-27 14:35:08 -05:00
Tim Pope
3933bfdc57 Prefer ds to dh for horizontal diff map 2011-02-27 13:15:10 -05:00
Tim Pope
2c0574594d Cease supporting :Gread! 2011-02-27 13:15:09 -05:00
Tim Pope
389efdcf14 Open current branch commits on :Gbrowse HEAD 2011-02-26 20:55:04 -05:00
Tim Pope
1e6d7c8a40 Fix use of throw 2011-02-26 20:12:34 -05:00
Tim Pope
d5f8446158 Let :Gdiff :/ diff against the work tree version 2011-02-26 18:55:47 -05:00
Tim Pope
383b2a43df Handle arbitrary :Gbrowse revision 2011-02-26 17:59:15 -05:00
Tim Pope
95311ab2d9 Ignore rev-parse warnings 2011-02-26 13:45:24 -05:00
Tim Pope
ca4e18c81f Allow -/ and :/ to refer to current work tree file 2011-02-26 12:39:19 -05:00
Tim Pope
1eeff6c349 :Gbrowse takes remote tracking branch into account 2011-02-24 16:31:50 -05:00
Tim Pope
9e05d7ee03 Allow :Gbrowse @git://... 2011-02-24 15:57:00 -05:00
Tim Pope
d6615891c2 Provide :Gbrowse to open code in web browser 2011-02-21 17:54:23 -05:00
Tim Pope
af9d44f91b Add filetype specific tags 2011-02-07 15:04:28 -05:00
Michael Geddes
156123520b Handle win32 change in behaviour of fnamemodify in 7.3
Signed-off-by: Michael Geddes <vimmer@frog.wheelycreek.net>
2011-01-09 17:40:37 -05:00
Tim Pope
33ea0aa4e7 Support submodules in :Gstatus 2011-01-08 16:52:40 -05:00
Tim Pope
9bbea8a2a1 Work around Vim parser idiosyncrasy 2011-01-04 15:04:47 -05:00
Tim Pope
882597d17e Fix trailing slash issues 2011-01-04 14:59:59 -05:00
Tim Pope
64ead8ea1c Don't overwrite paste buffer in :Gread 2010-12-27 23:50:32 -05:00
Tim Pope
ab35c2d9ab Allow :Gmove in a directory 2010-12-27 23:27:03 -05:00
Tim Pope
affce710e2 Mitigate conflict with DirDiff plugin
This plugin tries to be helpful about disabling diff mode when a diff
window closes, which was confusing DirDiff. We can mitigate that but
only disabling diff mode when b:git_dir matches.
2010-11-13 20:26:53 -05:00
Tim Pope
a5e9b2e93e Fix blind copy/paste 2010-11-13 20:15:53 -05:00
Tim Pope
22a832f958 Fix focus anomaly when closing a split
This is seemingly the cause of an incompatibility with the DirDiff
plugin.
2010-11-13 20:04:34 -05:00
Tim Pope
e954d364f5 Rename :Ghdiff to :Gsdiff 2010-11-05 19:45:08 -04:00
Tim Pope
0b4e32180b Fix restoration of :lcd after :Gblame
The restore of :lcd was happening after the split, meaning it was taking
effect in the wrong window.
2010-11-05 18:17:26 -04:00
Tim Pope
b3f38c4886 Add :Gvdiff and :Ghdiff aliases
I haven't decided if this will become the preferred interface or not.
2010-10-24 17:52:59 -04:00
Tim Pope
6ba88784a2 Add :Gvdiff alias for :Gdiff 2010-10-24 17:52:24 -04:00
Tim Pope
e64870df9c Fix error after empty commit message 2010-10-24 13:40:07 -04:00
Tim Pope
de602e3676 Remove debugging statement 2010-10-24 13:39:58 -04:00
Tim Pope
119fd9e1ad <C-N> and <C-P> in :Gstatus cycle between files 2010-09-15 23:24:05 -04:00
Tim Pope
24efca8f4f Fix :Gcommit with noisy pre-commit hook 2010-09-09 11:17:45 -04:00
Tim Pope
9d02bf0868 :Gwrite! calls git add --force 2010-08-21 22:52:45 -04:00
Tim Pope
45fe471b44 Attempt to address GitHub issue #16 2010-08-18 22:20:28 -04:00
Tim Pope
a8bd148683 Rename fugitive#buffer().name() to spec()
In rails.vim, path() and name() have the opposite (and dare I say more
intuitive) semantic of that found in fugitive.vim.  An outright switch
would be a little violent, so for now, rename name() to spec() (as in
"file spec").
2010-08-04 09:29:22 -04:00
Tim Pope
ea89d6ec12 FileType does not have <amatch> as path 2010-08-04 09:29:22 -04:00
Tim Pope
15282dde17 Tighten check of 'tags' for duplicate 2010-08-03 09:22:27 -04:00
Tim Pope
bdab318cc6 Fix setting of 'tags' 2010-08-02 16:52:39 -04:00
Tim Pope
ea588a104c Point 'tags' at .git/tags 2010-07-28 14:45:48 -04:00
Tim Pope
2b9faa8c7f Press dh in :Gstatus to do a horizontal diff 2010-07-28 09:14:25 -04:00
Tim Pope
562ab96b2f Whitespace fix 2010-07-26 11:22:52 -04:00
Michael Geddes
794c21484d Expose config settings and user signature.
Adds config() and user() to the fugitive#buffer() interface.

Signed-off-by: Michael Geddes <vimmer@frog.wheelycreek.net>
2010-06-28 14:39:21 -04:00
Tim Pope
7390538db0 Jump to horizontal diff on "index ..." lines 2010-06-28 11:50:44 -04:00
Tim Pope
8fcc5cb349 Fix :Gblame with csh 2010-06-08 11:08:05 -04:00
Michael Geddes
3121f01f59 Allow applying from git diffs to work under win32.
The introduction of using 'chcp' in the git.cmd wrapper was causing the
piped in values to be gobbled by the chcp in the call to update-index.

Signed-off-by: Michael Geddes <vimmer@frog.wheelycreek.net>
2010-06-02 23:44:42 -04:00
Tim Pope
ffcc12de5f Fix endif error 2010-06-02 23:43:33 -04:00
Tim Pope
6c44c4795e Only :diffoff in 'diff' buffers 2010-05-25 16:48:34 -04:00
Tim Pope
27e2212ac0 Fix indent 2010-05-25 16:32:09 -04:00
Tim Pope
2ed441fde7 Use window not buffer variable for window restore 2010-05-25 15:34:53 -04:00
Tim Pope
66812106e8 Add missing clear of augroup 2010-05-25 15:32:35 -04:00
Tim Pope
24c5a45431 Disable diff more more aggressively 2010-04-14 11:05:53 -04:00
Tim Pope
1f0bc8cff9 :Gdiff! splits horizontally 2010-04-14 10:49:21 -04:00
Tim Pope
ccfc60e550 fugitive.vim 1.1 2010-03-21 17:18:43 -04:00
Tim Pope
57393e7956 D in :Gstatus not on a file invokes :Git diff 2010-03-19 21:48:41 -04:00
Tim Pope
4975e76935 D in :Gstatus invokes :Gdiff 2010-03-19 21:23:41 -04:00
Tim Pope
e3e31ce9d7 Fix error in :Gmove 2010-03-19 21:06:08 -04:00
Tim Pope
56b8ad786b Allow double quotes in :Git and :Ggrep arguments
:Git and :Ggrep were defined with the -bar flag, which enables chaining
(`:Ggrep foo | copen`) but also comments (`:Ggrep foo " find foo).  The
former is useful but the latter prevents one from using double quotes
with commands.  Instead, let's disable -bar and fake it in the
implementation.

:Git implements chaining in a way that's hopefully the same as the way
Vim itself chains.  :Ggrep is a little different; it only chains after a
quote or a space so that `:Ggrep -e 'foo|bar'|copen` works as one would
expect.
2010-03-19 19:59:08 -04:00
Tim Pope
6b55a997a9 Finish pending commit even if exiting Vim 2010-03-11 22:15:35 -05:00
Tim Pope
b812cb3bcd Skip duplicate "Signed-off-by" [Wincent Colaiuta] 2010-03-10 19:44:38 -05:00
Tim Pope
13fd856db9 Strip .exe from completed Git commands 2010-03-10 19:37:49 -05:00
Tim Pope
1548f141e0 Fix restoring of $GIT_INDEX_FILE 2010-03-09 19:13:28 -05:00