Commit Graph
100 Commits
Author SHA1 Message Date
Tim Pope faa895239b Clean up gitdir file parsing 2019-08-15 03:34:00 -04:00
Tim Pope 6eb885c017 Always diff against parents in :Gdiffsplit! 2019-08-14 11:06:42 -04:00
Tim Pope 308e4bf241 Fix temp file gq shadowing blame gq 2019-08-14 09:38:39 -04:00
Tim Pope 7d484eaf52 Use s:Map() for nearly all maps 2019-08-14 09:38:39 -04:00
Tim Pope 34bfcd471b Fix error generating command for :'<,'>Gblame
Closes https://github.com/tpope/vim-fugitive/issues/1308
2019-08-14 09:38:39 -04:00
Tim Pope 1d2821f91e Clarify :Gstatus p behavior
I've seen a lot of confusion in the wild around this, and the old
behavior is immortalized in the Vimcasts.  Lets make this an error while
we regroup.
2019-08-14 01:44:13 -04:00
Tim Pope 53e5e61afa Emphasize :Glog behavior change
Let's go ahead and embrace :Gclog as a warning free version of the
command.
2019-08-14 01:44:13 -04:00
Tim Pope 1359d620eb Force <nowait> for all generated maps 2019-08-13 23:32:50 -04:00
Tim Pope 5defa72b81 Provide count on blob blame maps for --reverse 2019-08-13 21:31:01 -04:00
Tim Pope c21736dde7 Jump to file not diff for boundary commit in :Gblame 2019-08-13 21:31:01 -04:00
Tim Pope 11691b38bb Allow :Gblame ^boundary to use scrollbind 2019-08-13 21:31:01 -04:00
Tim Pope 69bf0e3469 Accept commit.. :Gblame argument as commit not filename 2019-08-13 20:58:10 -04:00
Tim Pope e7c2563288 Remove bang variant of :Git from README
This happens for the important commands automatically, and the new
override syntax is -P/--no-pager.
2019-08-13 19:44:17 -04:00
Tim Pope c0ce201c3b Remove :Git --paginate from docs
I thought the --paginate option was basically the opposite of
--no-pager, but it actually forces the entire command to run through a
pager, breaking a lot of interactive commands.  Let's de-emphasize it as
a solution.
2019-08-13 19:44:17 -04:00
Tim Pope 49b777ae44 Use rev-list in lieu of log with raw format 2019-08-13 17:24:17 -04:00
Tim Pope f33a53bceb Remove debug 2019-08-13 17:20:56 -04:00
Tim Pope 16bfd4fa92 Fix offset jumping to patch on :Gblame --reverse 2019-08-13 17:20:03 -04:00
Tim Pope 8038ee60a9 Fix -1 effectively canceling --reverse
Is there a way to apply a limit at the print level rather than the query
level?
2019-08-13 17:12:28 -04:00
Tim Pope 08a9a45dbc Support :rightbelow Gblame and other <mods>
Closes https://github.com/tpope/vim-fugitive/issues/976
2019-08-13 16:27:28 -04:00
Tim Pope 0a7ffc5d67 Use descendant when jumping to patch for :Gblame --reverse
References https://github.com/tpope/vim-fugitive/issues/1305
2019-08-13 16:27:28 -04:00
Tim Pope 0392f64a93 Make :Gblame a proper subcommand 2019-08-13 15:28:01 -04:00
Tim Pope d1033e756e Cleaner error on -z command failure 2019-08-13 15:28:01 -04:00
Tim Pope 79b1f16a7a Delegate :Git grep to :Ggrep 2019-08-12 00:12:18 -04:00
Tim Pope 03710a877a Use same window for commit message on :0Gcommit 2019-08-12 00:12:18 -04:00
Tim Pope b4d40abb10 Use lower case for subcommand declarations 2019-08-11 22:36:29 -04:00
Tim Pope 3ca888470b Expand diffs on :Gcommit --patch 2019-08-11 22:36:29 -04:00
Tim Pope 4460aeffdd Use temp buffer with man filetype for :Git help 2019-08-11 18:40:25 -04:00
Tim Pope 078210c718 Use temp buffer for :Git show and :Git stash show 2019-08-11 18:40:24 -04:00
Tim Pope d417fd3199 Move blame buffer settings to FileType event
The goal here is to extract just the settings that would work outside of
a vertical split with 'scrollbind' in effect, so we can one day add a
second mode.
2019-08-11 17:33:45 -04:00
Tim Pope 4daa0c558c Support nearly all git-blame flags 2019-08-11 01:17:22 -04:00
Tim Pope 7686b7dc5c Support blame.blankBoundary with Ignore highlight 2019-08-11 01:03:09 -04:00
Tim Pope 68f0cb87a9 Don't require <mods> for vertical/tab blame culprit maps 2019-08-11 01:03:09 -04:00
Tim Pope 9ca6e0c633 Remove q from :Gblame documentation 2019-08-10 22:24:35 -04:00
Tim Pope 97e993611e Highlight blame --score-debug and blame -c 2019-08-10 22:24:35 -04:00
Tim Pope 54f155218a Remove duplicate b:fugitive_status initialization 2019-08-10 22:24:35 -04:00
Tim Pope c7e3df5283 Provide some commit --reset-author maps
Supporting flags with additional maps is a pretty limited solution, as
there's no way to combine them (that is, we'd need to map both cRva and
cvRa to get both verbose and reset-author, and that's as silly as it is
hard to type in under a second).  I think some kind of getchar()
dispatcher is going to be the long term solution.
2019-08-10 22:24:35 -04:00
Tim Pope bc3d36e559 Remove 'guioptions' workaround 2019-08-09 00:51:59 -04:00
Tim Pope 8227503714 Open :Gstatus for :Gcommit -i and :Gcommit -p 2019-08-09 00:33:28 -04:00
Tim Pope f0acf3e883 Show dirty submodules in Unstaged section
Closes https://github.com/tpope/vim-fugitive/issues/1204
2019-08-09 00:33:28 -04:00
Tim Pope a09e49d2bb Support :Gblame --reverse
Closes https://github.com/tpope/vim-fugitive/issues/1305
2019-08-08 21:02:40 -04:00
Tim Pope cce9ca0933 Move select temp file configuration to BufReadPre
This allows the natural machinery to kick in rather than invoking
FugitiveDetect() and fugitive#MapJumps() explicitly.
2019-08-08 21:02:40 -04:00
Tim Pope 0a536ed5af Don't unnecessarily change ":verbose set scrollbind?" 2019-08-08 20:24:40 -04:00
Tim Pope 9420d05ddd Eliminate b:fugitive_blamed_bufnr 2019-08-08 20:24:40 -04:00
Tim Pope 6db7120c9a Don't double set temp options on blame buffer 2019-08-08 20:24:40 -04:00
Tim Pope 4a42d4e21c Encapsulate retrieval of blamed bufnr 2019-08-08 20:24:40 -04:00
Tim Pope 206b54a147 Retool :Gblame close map 2019-08-08 20:24:40 -04:00
Tim Pope 1260de3b7d Fix :Gread blobhash
References https://github.com/tpope/vim-fugitive/issues/836
2019-08-08 18:15:39 -04:00
Tim Pope 9d36dc2d74 Check for built-ins with .exe extension on Windows 2019-08-08 01:44:44 -04:00
Tim Pope 0db4ceb980 Restore press enter prompt in :Ggrep in GUI 2019-08-07 19:31:35 -04:00
Tim Pope 95c1f1525d Fix accidental utility invocation on :Git complete 2019-08-07 18:12:07 -04:00
Tim Pope cfca94c723 Expand simple aliases in :Git
This lets you alias ca = `git commit -a` and have `:Git ca` call
`:Gcommit -a`.
2019-08-07 17:31:14 -04:00
Tim Pope edae34e02f Fix count with jump to commit section 2019-08-07 00:52:38 -04:00
Tim Pope d7172882b7 Add default core.askPass to :Gpull 2019-08-06 20:01:18 -04:00
Tim Pope 511e32114b Swap gu and gU 2019-08-06 19:39:26 -04:00
Tim Pope 0cc3beeae9 Tweak commit for u rebase map 2019-08-06 14:32:39 -04:00
Tim Pope 0484c03c6b Allow :Grevert --abort/continue/quit 2019-08-06 14:10:45 -04:00
Tim Pope 9d77fd566c Add Git dir presence guard to all commands
This isn't necessary for the current implementation, but could enable
making the commands (or at least the underlying commands) global.
2019-08-06 14:10:45 -04:00
Tim Pope 35d7590354 Provide s/u mappings on commits
I need to figure out the big picture push story before I can document
the push maps.
2019-08-06 14:10:38 -04:00
Tim Pope c4d4986f1e Delegate :G command to :Gcommand for 8 commands 2019-08-04 00:05:18 -04:00
Tim Pope fb9acc6831 Add a FAQ entry about remote passwords 2019-08-03 21:38:28 -04:00
Tim Pope 81eec879a4 Update :Gstatus description in README 2019-08-03 21:38:28 -04:00
Tim Pope 14effe7bfb Mention :Gpull and related commands in README 2019-08-03 21:38:28 -04:00
Tim Pope 15fe543508 :Glog isn't that exciting 2019-08-03 21:38:28 -04:00
Tim Pope bd70719f54 Provide :Grevert and :Gmerge mappings 2019-08-03 21:38:28 -04:00
Tim Pope 0f08b0cbbb Provide separate file/hunk jump maps 2019-08-03 16:27:44 -04:00
Tim Pope 35cf80dd3b Fix :Gbrowse with range and blame.coloring enabled 2019-08-03 16:27:03 -04:00
Tim Pope dffa56c4ea Retool section jump maps 2019-08-03 00:52:08 -04:00
Tim Pope 9ac6a258d6 Fall back to "commit" line for file hunk jump maps
This enables jumping from commit to commit in :Git log.
2019-08-02 23:41:57 -04:00
Tim Pope e5a6a8c525 Support jump maps in visual mode 2019-08-02 20:21:23 -04:00
Tim Pope 875a58c2e1 Document :Git --paginate
Was planning on keeping this unofficial, but I think we need to provide
an alternative to loading :Git log in a temp file.
2019-08-02 20:21:23 -04:00
Tim Pope 3f417d7ad1 Enable fixup/squash maps in :Git log 2019-08-02 20:21:23 -04:00
Tim Pope 2b757e87d5 Disable modelines in temp files 2019-08-02 20:21:23 -04:00
Tim Pope 4c0dbb66eb Always use temp file for :Git diff and :Git log
You can use :Git -p log to get a terminal instead.
2019-08-02 13:31:55 -04:00
Tim Pope 9118ed27c3 Add -addr= declarations 2019-08-02 13:26:18 -04:00
Tim Pope 291cf5d1bc :0Ggrep calls :Glgrep 2019-08-02 13:17:08 -04:00
Tim Pope 928e1e71e7 Document :Git --no-pager 2019-08-02 02:00:16 -04:00
Tim Pope b9c47cec52 Add command dispatcher
This will enable cleaning up some of the repetition in argument and
exception handling
2019-08-02 01:45:33 -04:00
Tim Pope 21991bcbaf Eliminate redundant :G and :Git implementations 2019-08-02 01:09:20 -04:00
Tim Pope 665cec73d9 Provide :Grevert 2019-08-01 23:22:10 -04:00
Tim Pope d54e98bedb Remove overlooked 40 character limits 2019-08-01 23:22:10 -04:00
Tim Pope 0ab2d9709c Preserve cursor position after staging last untracked file 2019-08-01 19:27:41 -04:00
Tim Pope 7df9f07e1f Compensate for blame.coloring
Closes https://github.com/tpope/vim-fugitive/issues/1301
2019-08-01 12:46:45 -04:00
Tim Pope fb3c603ce6 Always use temp file for :Git --no-pager 2019-08-01 12:46:09 -04:00
Tim Pope 44ade58ed5 Always use :terminal for :Git --paginate
References https://github.com/tpope/vim-fugitive/issues/1294
2019-07-30 13:05:16 -04:00
Tim Pope 881d72f1af Preserve index on cza and czp 2019-07-29 17:16:58 -04:00
Tim Pope f3dde245b3 Map I to :Git add --intent-to-add 2019-07-29 17:16:58 -04:00
Tim Pope a3ab24f681 Fire synthetic QuickFix events on :Ggrep
References https://github.com/tpope/vim-fugitive/issues/1297
2019-07-29 13:23:59 -04:00
Tim Pope bd89fd440b Fix error message for rev-parse 2019-07-29 00:48:57 -04:00
Tim Pope 3c4ad5ff72 Avoid unnecessary diffing in :Gstatus 2019-07-28 21:50:49 -04:00
Tim Pope fff24e29e6 Add czA and czP aliases for cza and czp
One set of these will get --index.  I'll decide which later.
2019-07-28 21:50:49 -04:00
Tim Pope 0810dcc805 Fix typo 2019-07-28 20:42:37 -04:00
Tim Pope 3b0f68180f Compensate for bad 'shellredir' 2019-07-28 19:21:01 -04:00
Tim Pope 49f3f92fd5 Guard against inadvertent :| invocation
I haven't been able to consistently reproduce it, but sometimes vim
takes :edit +CmdA\|CmdB to mean :CmdA followed by :| and not :CmdA
followed by :CmdB.
2019-07-28 19:16:28 -04:00
Tim Pope 645406f592 Use :Gdiffsplit! for diff maps
This opens a 3 way diff for merges and also focuses the more useful
window.
2019-07-28 01:20:38 -04:00
Tim Pope 7bfce97480 Provide misc :Git mappings 2019-07-28 01:12:33 -04:00
Tim Pope 3e9ef9349d Remove error guards for old object syntax 2019-07-28 01:10:37 -04:00
Tim Pope 881ad1ed0b Guard against missing output on :Gcommit success 2019-07-26 21:56:39 -04:00
Tim Pope ebc3f35575 Require bang to :Gwrite from index
Closes https://github.com/tpope/vim-fugitive/issues/1057
2019-07-26 11:32:24 -04:00
Tim Pope 79566b5ddd Don't override alt buffer on :Gwrite from index 2019-07-26 11:32:24 -04:00
Tim Pope d90e912e46 Provide ignoring maps
Closes https://github.com/tpope/vim-fugitive/issues/235
2019-07-24 21:27:16 -04:00