Commit Graph

915 Commits

Author SHA1 Message Date
Tim Pope b1a993964b Fix commit maps while accommodating bad modelines
We need modifiable off for the maps to kick in, but we need to turn it
back off before the doautocmd or else it will throw an error if the
modeline modifies the buffer with an option like fileencoding, which you
should never do, stop doing it.
2019-01-05 01:44:04 -05:00
Tim Pope b88d064ac4 Nobody has a version of Vim older than 7.2 anymore 2019-01-05 01:36:40 -05:00
Tim Pope 201896b9a2 Clarify - map 2019-01-05 01:33:17 -05:00
Tim Pope acf3cb4400 Reveal full hunk on :Gstatus CTRL-N 2019-01-03 22:47:41 -05:00
Tim Pope 9c74c0d0a7 Restore :checktime for :Gstatus delete
I assumed this was a naive attempt to reload the status buffer, when in
fact it was concerned with reloading the deleted file.
2019-01-03 22:47:41 -05:00
Tim Pope 4df6525284 Fix check for :Gstatus window 2019-01-03 22:47:41 -05:00
Tim Pope a4de0238bb Try split instead of preview window for :G 2019-01-03 21:08:27 -05:00
Tim Pope 227159e964 Include backslash lines in diff hunks 2019-01-03 21:08:27 -05:00
Tim Pope 9e4fd4b3f6 Run diff for :Gstatus from project root
Closes https://github.com/tpope/vim-fugitive/issues/1155
2019-01-03 21:08:27 -05:00
Tim Pope 8c89c8d1f5 Enable maps in :Git! output buffers 2019-01-03 16:08:01 -05:00
Tim Pope 42408d6a2e Don't break jump list when loading buffer
Closes https://github.com/tpope/vim-fugitive/issues/1124
2019-01-03 16:08:01 -05:00
Tim Pope 3383badda5 Don't stage/unstage from unstage/stage maps
This needs count and visual selection support.
2019-01-03 12:20:54 -05:00
Tim Pope faeb3a9726 Enable discarding individual hunks 2019-01-03 11:44:19 -05:00
Tim Pope 357fbdbcf9 Enable staging individual hunks 2019-01-03 11:44:19 -05:00
Tim Pope 6cf448324c Fix inline diffs including submodule logs
Closes https://github.com/tpope/vim-fugitive/issues/1151
2019-01-03 11:44:19 -05:00
Andrew Haust fa6d7886e7 Fix patch mapping in README 2019-01-03 11:02:10 -05:00
Tim Pope d948ec3376 Support expanding inline diffs in :Gstatus 2019-01-03 00:19:21 -05:00
Tim Pope 51abc6a1bb Fix :Gstatus toggle on Unstaged heading 2019-01-02 16:58:50 -05:00
Tim Pope d4e06150cb Fix issue loading conflict buffers on :Grebase -i 2019-01-02 16:58:50 -05:00
Tim Pope 61d467b573 Extract function for reloading individual :Gstatus 2019-01-02 16:58:50 -05:00
Tim Pope 054ac50975 Fix reference to rebase buffer when closing tab 2019-01-01 19:28:01 -05:00
Tim Pope 037965583e Don't overlap navigation maps with :Gcommit maps 2019-01-01 19:01:33 -05:00
Tim Pope 4c7998f58c Add :G as alias for :Gstatus 2019-01-01 14:21:16 -05:00
Tim Pope 40e8d0b9f0 Support for :Grebase --interactive 2018-12-31 13:48:38 -05:00
Tim Pope 9aef731593 Add rebase summary to :Gstatus
For lack of better ideas this is heavily inspired by Magit, though I'm
not really convinced it's the best representation.
2018-12-31 12:08:31 -05:00
Tim Pope bad1331607 Don't jump from :Gstatus another :Gstatus 2018-12-31 12:07:45 -05:00
Tim Pope ce3d3df508 Fix maps in commit buffers 2018-12-31 01:45:12 -05:00
Tim Pope cb18a96651 Do what I mean for :Grebase --autosquash 2018-12-31 01:01:07 -05:00
Tim Pope b8364709e7 Refer :Gstatus p users to P 2018-12-31 01:01:07 -05:00
Tim Pope b9825af3dc Fix focus bug on reloading multiple :Gstatus buffers 2018-12-31 01:01:07 -05:00
Tim Pope 08179e1860 Declare highlights as defaults 2018-12-30 22:19:33 -05:00
Tim Pope 682b2acdac Remove outdated reference to :Gcommit calling :Gstatus
Closes https://github.com/tpope/vim-fugitive/issues/1144
2018-12-29 12:40:06 -05:00
Tim Pope d41dee9c0b Deprecate fugitive#buffer() 2018-12-28 17:54:57 -05:00
rbong b66141e252 Open todo file on Grebase --edit-todo 2018-12-28 17:53:01 -05:00
rbong ae8fed6dd3 Call Gcommit on Grebase --continue
On a rebase instruction that should result in an immediate commit,
the quickfix list will be closed and Gcommit will be called.
2018-12-28 17:53:01 -05:00
Tim Pope 0850600021 Combine unstaged and untracked files into one section
Is this a good idea?  Let's find out!
2018-12-27 18:05:29 -05:00
Tim Pope 86990ef899 Fix - on :Gstatus section headings 2018-12-27 17:34:51 -05:00
Tim Pope f2b644a60b Set dispatch to :Gfetch in :Gstatus 2018-12-26 16:24:16 -05:00
Tim Pope a1f9596d2d Add mods support to :Gmerge 2018-12-26 16:24:16 -05:00
Tim Pope de1f8b5a20 Fix workaround to reload status after :Dispatch 2018-12-26 16:24:16 -05:00
Tim Pope a32c301f51 Remove :Gcommit claiming :Gstatus window 2018-12-25 19:36:26 -05:00
Tim Pope 261c00986d Change vsplit map from S to gO 2018-12-25 19:35:13 -05:00
Tim Pope 01050c9569 Fix :Gstatus error on branch without pull source 2018-12-25 16:35:00 -05:00
Tim Pope d3468dd09b Prototype new :Gstatus 2018-12-25 14:11:50 -05:00
Tim Pope d06080ae35 Reload status after dispatch.vim backed :Gpush 2018-12-24 17:25:32 -05:00
Tim Pope 1044e0f126 Fix config case sensitivity when cached 2018-12-24 17:25:29 -05:00
Tim Pope d4eba85499 Add maps for :Gcommit --fixup/--squash 2018-12-24 14:42:47 -05:00
Tim Pope b295f49e93 Change :Gstatus U to g|
I want U for a full `git reset`.  This will probably end up on X, but I
don't want to do a second abrupt transition, so for now, the official
map is the ungainly g|.
2018-12-24 14:42:47 -05:00
Tim Pope d625c55689 Fix erratic conf file type on :Gstatus
Closes https://github.com/tpope/vim-fugitive/issues/1137
2018-12-24 11:36:39 -05:00
Tim Pope baee3bbfe8 Prevent bad modeline from blocking a :split
Closes https://github.com/tpope/vim-fugitive/issues/1136
2018-12-23 17:15:44 -05:00