Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Neovim Nightly] 0.10 #978

Merged
merged 532 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
532 commits
Select commit Hold shift + click to select a range
10bf0a6
Merge branch 'master' into nightly
Mar 22, 2024
e464bd2
Debounce dispatching refresh so things like stashing and other actions
CKolkey Mar 22, 2024
66e6f81
Merge branch 'master' into nightly
Mar 23, 2024
fe8ea4d
Fix: No more status on nightly
CKolkey Mar 23, 2024
cd84d51
Use abbreviated commit to ensure it's the correct length.
CKolkey Mar 23, 2024
f9e6e0d
Fix commit parsing to handle binary files
CKolkey Mar 23, 2024
e6a9f23
Memoize abbreviated size call as it should change very very
CKolkey Mar 23, 2024
48ab489
I forgot we had this - use it to get the abbreviated commit.
CKolkey Mar 23, 2024
746988c
Implement rebase autosquash
CKolkey Mar 23, 2024
4b85276
Merge branch 'master' into nightly
CKolkey Mar 23, 2024
d543e72
Cleanup rebase actions
CKolkey Mar 23, 2024
3b9269e
Update rebase docs
CKolkey Mar 23, 2024
f42d1fc
Ensure we set the fold-method correctly
CKolkey Mar 23, 2024
c116006
Simplify how these are set
CKolkey Mar 23, 2024
b8c8b7c
Change the filewatcher to be ENABLED by default, remove unused config
CKolkey Mar 23, 2024
95b51c2
Capture filewatcher as field on status buffer instance, close it only if
CKolkey Mar 23, 2024
9818448
Stage/Unstage: Only refresh if we actually did something
CKolkey Mar 23, 2024
e3d7084
Use the correct diff popup
CKolkey Mar 23, 2024
1372dc8
Pad graph properly
CKolkey Mar 23, 2024
529bc7e
Fix: for-each-ref takes a slightly different printf format for escape
CKolkey Mar 23, 2024
b6ad341
Void-wrap the action so we can use call inside the closure, and hide it
CKolkey Mar 23, 2024
6aab26e
Trim is automatic now
CKolkey Mar 23, 2024
0c48c59
Fix: Refs view uses correct length OIDs
CKolkey Mar 23, 2024
e7348c3
Reflog has some alignment constraints, so just have this be 7.
CKolkey Mar 23, 2024
1138523
Add abbreviated_commit interface to items here
CKolkey Mar 23, 2024
b3e60e4
Save/restore view in status buffer
CKolkey Mar 23, 2024
050287d
Cleanup
CKolkey Mar 23, 2024
09b2ab2
Feature: Commit select buffer header
CKolkey Mar 24, 2024
1c503db
Add basic bisect popup
CKolkey Mar 24, 2024
bc99be8
Add "reset branch" to reset popup
CKolkey Mar 25, 2024
a37ebee
Improve how buffer context highlights work: We only need to redraw the
CKolkey Mar 25, 2024
0bedd9b
Add redraw after choice input so any followup input calls will have a
CKolkey Mar 25, 2024
341dc63
Use new refs lib for refs. Should help simplify a lot of calls to
CKolkey Mar 26, 2024
7397650
Initial working bisect
CKolkey Mar 26, 2024
e1dd00a
Only show tag distance when not detached
CKolkey Mar 26, 2024
27d1835
Improve Head and Tag when detached
CKolkey Mar 26, 2024
5770bf4
Fix bug in reflog when rebase finished
CKolkey Mar 26, 2024
4e69b6d
Merge pull request #1218 from NeogitOrg/add-bisect
CKolkey Mar 26, 2024
ac32caf
Lint
CKolkey Mar 26, 2024
e720694
Merge pull request #1219 from NeogitOrg/actually-add-bisect
CKolkey Mar 26, 2024
cd3f1c3
Don't show script action in bisect
CKolkey Mar 26, 2024
89edf92
add bisect to help popup
CKolkey Mar 27, 2024
071000e
improve bisecting
CKolkey Mar 27, 2024
13d6079
add bisect scripted
CKolkey Mar 27, 2024
af487f2
Bisect: Guard resetting bisection behind confirmation except when
CKolkey Mar 27, 2024
37675a1
Correctly capture cursor location in a section that has no items/hunks.
CKolkey Mar 27, 2024
db7217c
Dispatch refresh when re-entering status buffer. The issue this solves
CKolkey Mar 27, 2024
e17922e
fix: When there are no commits, use an empty table so we still show the
CKolkey Mar 27, 2024
e21a521
Extract the UI lib from popup - this makes updating state way simpler,
CKolkey Mar 27, 2024
d23c330
Fix: Fuzzy finder popup should be the right height now
CKolkey Mar 27, 2024
74ec420
Update some flags to be more in line with Magit
CKolkey Mar 27, 2024
ccf9c57
Merge branch 'master' into nightly
CKolkey Mar 27, 2024
83690f5
Send \04 (ctrl-d) for all callers.. They shouldn't need to know this
CKolkey Jan 14, 2024
96b9a34
When an "amend! xxxxx" declaration is used, capture it and hide it away.
CKolkey Jan 14, 2024
8c11617
Refactor rebase/rewrite action.
CKolkey Jan 14, 2024
dfd1dc0
This is unused now.
CKolkey Jan 14, 2024
fd86e0a
This should be local function
CKolkey Jan 15, 2024
5161e80
Autosquash and autostash should always happen
CKolkey Jan 16, 2024
77c6394
fix specs
CKolkey Mar 27, 2024
58af2bc
Correctly capture multi-line messages
CKolkey Mar 27, 2024
9eab142
Merge pull request #1132 from NeogitOrg/Use-editor-for-reword
CKolkey Mar 27, 2024
3b6cb84
Lint
CKolkey Mar 27, 2024
b17fce2
Make selene happy
CKolkey Mar 27, 2024
c0b31d8
Handle unmerged/added files in conflict resolution
CKolkey Mar 28, 2024
5a197c6
Merge branch 'master' into nightly
CKolkey Mar 28, 2024
a5f070b
Merge branch 'master' into nightly
CKolkey Mar 28, 2024
7904cf3
Cleanup: Rewrite how is_open check is done. Don't manage the state
CKolkey Mar 28, 2024
fd27613
Rewrite: OpenOrScrollDown and OpenOrScrollUp mapping can now be
CKolkey Mar 28, 2024
a1e0322
allow refs buffer type to be user configurable
CKolkey Mar 28, 2024
ae3d035
squash! allow refs buffer type to be user configurable
CKolkey Mar 28, 2024
2ec1a92
When closing the status buffer, check for commit view, and close that
CKolkey Mar 28, 2024
3217f92
add is_open to commit view
CKolkey Mar 28, 2024
4078d62
Update config
CKolkey Mar 28, 2024
9d4e9d4
Test using lua callbacks for buffer detach
CKolkey Mar 28, 2024
a380d41
Allow separate mappings for insert mode mappings in commit/rebase editor
CKolkey Mar 29, 2024
ef67502
Merge branch 'master' into nightly
Mar 29, 2024
584f980
Allow for a popup launched BEFORE launching the status buffer to
CKolkey Mar 29, 2024
c5eb50f
Update annotations
CKolkey Mar 29, 2024
8c06358
Use correct maps in reflog view
CKolkey Mar 29, 2024
241a3c1
Merge branch 'master' into nightly
Mar 31, 2024
b34cc56
Do not show the notificiation in the nightly branch
CKolkey Mar 31, 2024
86863aa
Add OpenOrScrollUp/OpenOrScrollDown to refs view
CKolkey Mar 31, 2024
4baaa76
Standardize UI closing
CKolkey Mar 31, 2024
d3d9817
Better control of buffer instances
CKolkey Mar 31, 2024
4ede974
Guard calls to status.instance as it may be nil
CKolkey Mar 31, 2024
377648e
is_open() checks M.instance already
CKolkey Mar 31, 2024
f2c4316
Fix: Change how this checks for status instance - we can't call
CKolkey Mar 31, 2024
3701d95
Change how we get the length of abbreviated commits
CKolkey Mar 31, 2024
4fa379c
Use status maps for commit close/toggle
CKolkey Mar 31, 2024
10d1fe0
Fix: Do not early-return from fold-toggle if the section is closed. This
CKolkey Apr 1, 2024
634b11b
Improve annotations for mappings manager
CKolkey Apr 1, 2024
9043ad7
Do not set buffer/window options if buffer/window handle is nil
CKolkey Apr 1, 2024
9413e4e
Use "on_detach" callback in buffer setup
CKolkey Apr 1, 2024
2430e5b
Clean up buffer creation code, add logging, and do a little refactoring
CKolkey Apr 1, 2024
c3d6429
remove trailing whitespace from readme
CKolkey Apr 2, 2024
186cf80
Update "OpenOrScrollUp/Down" mapping to be [c and ]c. User remappable,
CKolkey Apr 2, 2024
17159dc
Update documentation for key mappings
CKolkey Apr 2, 2024
3354d02
Cleanup: All calls to internal git lib should go through
CKolkey Apr 2, 2024
17e2356
Refactor watcher to accept the status buffer as a parameter. Removes the
CKolkey Apr 2, 2024
aa5bf89
squash! Cleanup: All calls to internal git lib should go through "neo…
CKolkey Apr 2, 2024
26a94ba
Remove echo popup - only used for testing
CKolkey Apr 2, 2024
7cb6535
Improve Ex command autocomplete
CKolkey Apr 2, 2024
fffb448
Fix: Don't crash when the first section has no start. Applies to a
CKolkey Apr 2, 2024
ff2df2d
Refactor: Better management of repositories with respect to multiple git
CKolkey Apr 3, 2024
d62fd23
Refactor: Better status buffer instance management. Should allow for
CKolkey Apr 3, 2024
fa6144b
fix type
CKolkey Apr 3, 2024
2f8d330
Fix for new repos that have no commits. Use a default value.
CKolkey Apr 3, 2024
677246e
Use initialized values instead of requiring them directly
CKolkey Apr 3, 2024
be605ac
Fix: Use absolute path instead of escaped relative path when opening a
CKolkey Apr 3, 2024
f3eaff3
Fix: Use a safer means to get the section name, which works when the
CKolkey Apr 3, 2024
3590b9d
Fix: When there is already a neogit instance for the DIR open, focus it
CKolkey Apr 3, 2024
d870d7a
Fix: When neogit is the last tab page, and the user attempts to close
CKolkey Apr 3, 2024
7eb3d9c
Fix: When the cursor is located _between_ sections, don't change the
CKolkey Apr 3, 2024
6f9906b
Fix: When discarding multiple unstaged files in visual mode, don't raise
CKolkey Apr 3, 2024
3ffb3e6
Better usage of diff invalidation
CKolkey Apr 5, 2024
9b7abbf
Ensure foldmethod is set to "manual" when setting folds. Fixes a bug
CKolkey Apr 5, 2024
814cff7
Copy fold status over better, and set up internal data structure for
CKolkey Apr 5, 2024
5ffe26b
Use absolute paths when opening files so we can handle non-cwd instances
CKolkey Apr 5, 2024
eecfc95
Feat: when using j/k, skip over "blank" lines between sections
CKolkey Apr 5, 2024
9f07dea
Reimplement fold markers in the status buffer
CKolkey Apr 6, 2024
1f6ab9d
Reimplement the commit HASH in the head of the status buffer,
CKolkey Apr 6, 2024
a49eabe
More robust ignoring of exit(1) when aborting an edit
CKolkey Apr 7, 2024
7a60374
Fix: When opening status buffer in a brand new repo, it'll encounter an
CKolkey Apr 7, 2024
0704267
Fix props.yankable error, display (detached) again
AThePeanut4 Apr 7, 2024
e79a70e
Fix EmptyLine component
AThePeanut4 Apr 7, 2024
4ddc5db
Allow folding on empty line again
AThePeanut4 Apr 7, 2024
ce36416
Fix: Due to this issue: https://github.com/NeogitOrg/neogit/issues/1236
CKolkey Apr 7, 2024
d1785ae
Merge pull request #1244 from AThePeanut4/fix-status-buffer
CKolkey Apr 7, 2024
18938e2
Nicer formatting for statuscolumn
CKolkey Apr 7, 2024
9df7b92
Fix: Watch ./.git/ of repo
CKolkey Apr 8, 2024
edbb87c
lint
CKolkey Apr 8, 2024
9964072
Remove BufEnter autocmd - watcher should take care of refreshing
CKolkey Apr 8, 2024
5c7c466
Add git absorb support
CKolkey Apr 8, 2024
14207ff
Add git-absorb to commit popup
CKolkey Apr 8, 2024
c094fa1
Add git-absorb to cli
CKolkey Apr 8, 2024
876f14b
Add documentation for git absorb
CKolkey Apr 8, 2024
8edd1b7
Add highlight groups for + an - signs with no background color
CKolkey Apr 9, 2024
8e489a0
Add buffer for diffing staged files
CKolkey Apr 9, 2024
e4390a9
Breaking: (kinda) Change default for commit editor from "auto" to "tab".
CKolkey Apr 9, 2024
b34f0eb
Hide abbreviated_size call from user
CKolkey Apr 9, 2024
e1dc674
Add a header to the diff buffer, showing its staged changes
CKolkey Apr 10, 2024
189407c
cleanup
CKolkey Apr 10, 2024
abbb35a
Add highlights to branch/remote in editor
CKolkey Apr 10, 2024
9ecd60f
Clean up docs
CKolkey Apr 10, 2024
a31973d
add some space
CKolkey Apr 10, 2024
f6aff3e
Fix: Replace signcolumn and fillchars settings. These were not optional
CKolkey Apr 10, 2024
40aea38
Add a nice space after the fold arrow
CKolkey Apr 10, 2024
7c8e48a
Add better logging to editor
CKolkey Apr 10, 2024
ea64a1f
Add "kind" to git history buffer
CKolkey Apr 10, 2024
5af0ef0
When debugging, pass debug ENV vars to client
CKolkey Apr 10, 2024
a6f632e
Fix: Diffview should take a string here
CKolkey Apr 10, 2024
18a46b1
Improve docs
CKolkey Apr 11, 2024
d2e32fb
add events tag to docs
CKolkey Apr 11, 2024
162e9c7
formatting
CKolkey Apr 11, 2024
475a474
Add better mouse support to telescope picker - fixes closing picker by
CKolkey Apr 12, 2024
ca815d1
Don't write to log if the file doesn't exist
CKolkey Apr 12, 2024
95d5975
Ensure all list chars are turned off for neogit buffer, and clamp
CKolkey Apr 12, 2024
717dd95
Add fast j/k navigation to refs and log view, skipping blank lines
CKolkey Apr 12, 2024
387df88
When dropping the stash that was under cursor, ask for confirmation from
CKolkey Apr 12, 2024
89e0882
Fix: The structure of the on_select and close_action requires this, or
CKolkey Apr 13, 2024
631659e
Show decoration in Recent Commits section of status buffer
CKolkey Apr 13, 2024
857c761
Decoration: Show "HEAD" as "@"
CKolkey Apr 13, 2024
c6f5b60
Conditionally show count of sections (basically, don't show it for the
CKolkey Apr 13, 2024
d59719a
Lowercase all file statuses in status buffer
CKolkey Apr 13, 2024
09e7731
Schedule this so calling :wq in commit buffer doesn't error
CKolkey Apr 13, 2024
1ecb91e
Use autocmd to close diff view when commit editor was closed via ":wq"
CKolkey Apr 13, 2024
c97d879
Fix: can't use fmt_* logging...
CKolkey Apr 13, 2024
c722b28
Only show diff for staged changes
CKolkey Apr 13, 2024
61ab7b5
Notes
CKolkey Apr 13, 2024
f7f5f4e
Use QuitPre, since it's triggered explicitly on :wq
CKolkey Apr 13, 2024
0a7a6f4
Swap the order of unmerged and unpulled
CKolkey Apr 14, 2024
3aa9d60
Move async logic from popup builder into the caller of the actions to be
CKolkey Apr 14, 2024
a439dfa
Cleanup: Rewrite last vim.fn.input calls that didn't go through input
CKolkey Apr 14, 2024
ee94bb2
Cleanup interactive CLI input handler
CKolkey Apr 14, 2024
7318212
Rework action invocation so the popup closes quickly instead of waiting
CKolkey Apr 14, 2024
7dde905
Add better annotations to popup builder
CKolkey Apr 15, 2024
15688d8
Guard mouse support for telescope behind check since current latest tag
CKolkey Apr 16, 2024
345f444
Feature: Add "+" mapping to log buffer, that will append an additional n
CKolkey Apr 16, 2024
bb0dc2e
Fix: When arg.value is nil, you cant get it's length
CKolkey Apr 16, 2024
68d7c3d
Feature: Add configuration for status.reset_style - this allows the user
CKolkey Apr 17, 2024
619bdc4
formatting
CKolkey Apr 17, 2024
c1b8d29
Revert 1 commits
CKolkey Apr 17, 2024
711b02f
Replace static config option with a variable that can be set on the fly.
CKolkey Apr 17, 2024
9fb8936
Only show/use neogit.resetThisTo when selecting a commit before
CKolkey Apr 17, 2024
1adf0b9
Bugfix: when user cancelled a choice, use the default
CKolkey Apr 17, 2024
8c69b87
Capture and restore user statuscolumn when opening split from neogit
CKolkey Apr 17, 2024
50ab277
Add individual highlight groups for each status section header, linking
CKolkey Apr 18, 2024
fd63c19
Allow mode text and mode padding to be user configurable on the status
CKolkey Apr 18, 2024
9e9b9f2
Handle committing with an empty commit
CKolkey Apr 18, 2024
5d24c8c
Fix: Remote parsing when the url doesn't end in .git should be handled.
CKolkey Apr 18, 2024
62ff78c
Fix: When user has changed status buffer labels, highlight groups should
CKolkey Apr 18, 2024
89c7842
Merge branch 'master' into nightly
CKolkey Apr 18, 2024
5748a61
Fix up passing commits into reset popup. ths switch idea was dumb, just
CKolkey Apr 19, 2024
5b16285
fix: new file hl group on status buffer wasn't properly applied
CKolkey Apr 19, 2024
80b8057
Perf: Prevent string concatonations, memoize refs for 1000ms, and pass
CKolkey Apr 20, 2024
5e0c910
Perf: Prevent extra allocations when filtering ansi codes from stdout
CKolkey Apr 20, 2024
023a515
Allow closing diff buffer
CKolkey Apr 20, 2024
95e31ad
Use 'NeogitObjectId' hl group instead of "comment" - but link that to
CKolkey Apr 21, 2024
e76dbc5
Internally, link all hl groups to NeogitSubtleText instead of Comment.
CKolkey Apr 21, 2024
3c83d1b
Highlight 'Head', 'Merge', 'Tags', with "NeogitStatusHEAD"
CKolkey Apr 21, 2024
34e5296
Correction to docs: hl group name
CKolkey Apr 21, 2024
d581789
Correction to docs: No longer using NeogitCursorLine hl group
CKolkey Apr 21, 2024
0f871d0
Formatting and docs.
CKolkey Apr 21, 2024
c31acc5
Add user configurable HEAD padding to status buffer
CKolkey Apr 21, 2024
fbf4619
Update config in readme
CKolkey Apr 21, 2024
614cbd9
Move config.show_head_commit_hash to config.status.show_head_commit_hash
CKolkey Apr 22, 2024
0a513ca
Add highlight group for the number of changes in a section of the status
CKolkey Apr 22, 2024
2c150da
Use decoration provider to set fold icons in status column
CKolkey Apr 22, 2024
656241f
formatting
CKolkey Apr 22, 2024
88e11ef
breaking: remove "auto_refresh" setting - this is now managed by the
CKolkey Apr 22, 2024
45dcbb6
Add back statuscolumn for some buffers
CKolkey Apr 22, 2024
98ae166
Add more fine-grained highlighting to labels in status buffer. By
CKolkey Apr 25, 2024
b210b2d
Add better type annotations to the lib/git so gotodefinition works
CKolkey Apr 25, 2024
8378ed9
Add pattern escaping to checking remote patterns for pull request
CKolkey Apr 25, 2024
9f29110
Allow staged diff to be user configurable
CKolkey Apr 26, 2024
dd2dbf8
Cleanup in status buffer init with a helper function for removing a file
CKolkey Apr 26, 2024
df527d1
Fix: More robust cursor positioning for a buffer
CKolkey Apr 26, 2024
286de60
Remove MappingsManager - this was a holdover from before
CKolkey Apr 28, 2024
a6df936
Cleanup: Add a table wrap method to simplify callers that might get a
CKolkey Apr 28, 2024
9c0a04d
standardize how we set window options
CKolkey Apr 28, 2024
1d021f2
Use win_exec to set folds so we can update the buffer without it being
CKolkey Apr 28, 2024
50904dc
Bugfix: Don't filter out non-relative paths from ignore suggestions
CKolkey Apr 30, 2024
183212c
Fix: #1269
CKolkey Apr 30, 2024
0cd0899
Merge branch 'master' into nightly
CKolkey Apr 30, 2024
ac8cd9d
Fix error params in process.lua
davidmh May 5, 2024
629ae4c
Merge pull request #1276 from davidmh/fix-error-param
CKolkey May 5, 2024
058a957
Extract actions from status buffer so we can call them from the help
CKolkey May 4, 2024
5ee392a
Use user setting for context highlight
CKolkey May 5, 2024
2bfcd2b
cleanup
CKolkey May 5, 2024
f10084a
Add move merge actions
CKolkey May 6, 2024
3492e13
Add unmerged type suffex
CKolkey May 6, 2024
e9a4483
move unmerged changes to "staged" section
CKolkey May 6, 2024
b6fe380
simplify things
CKolkey May 6, 2024
60f4106
Move conflict resolution to staged
CKolkey May 6, 2024
a80896b
Possibly overkill: Handle unmerged files in both staged and unstaged
CKolkey May 7, 2024
24eb181
Replace "comment" hls with NeogitSubtleText (which links to comment)
CKolkey May 7, 2024
788e501
Add: Untrack mapping to status buffer. "K". Untracks a file, or selected
CKolkey May 7, 2024
db029ae
Check for success
CKolkey May 7, 2024
f17da76
fix: this needs to be "unstaged" so resolutions can be staged.
CKolkey May 9, 2024
ec9574f
Improvement: Untrack files will list _all_ tracked files in a fuzzy
CKolkey May 9, 2024
9cc538e
Merge branch 'master' into nightly
CKolkey May 9, 2024
c72c25a
Add better highlighting of status buffer when file has a merge conflict.
CKolkey May 9, 2024
6d0be60
Merge branch 'master' into nightly
CKolkey May 9, 2024
b8ace31
replace plenary.job with vim.system
CKolkey May 9, 2024
767c6ed
remove buffer buffers - not needed
CKolkey May 10, 2024
5033eb3
Refactor: Remove mapping for Console buffer, change buffer to be
CKolkey May 11, 2024
eedcb6b
add diff popup to commit view
CKolkey May 13, 2024
4f0ca51
improve how we goto files
CKolkey May 13, 2024
eca97db
lint
CKolkey May 13, 2024
1bd1c52
Merge branch 'master' into nightly
CKolkey May 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ jobs:
test:
name: Test
runs-on: ubuntu-latest
strategy:
matrix:
release: [stable, nightly]
steps:
- uses: actions/checkout@v4

Expand All @@ -25,7 +28,7 @@ jobs:

- name: Install Neovim
run: |
wget https://github.com/neovim/neovim/releases/download/stable/nvim-linux64.tar.gz
wget https://github.com/neovim/neovim/releases/download/${{ matrix.release }}/nvim-linux64.tar.gz
tar -zxf nvim-linux64.tar.gz
sudo ln -s $(pwd)/nvim-linux64/bin/nvim /usr/local/bin

Expand Down
3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
MIT License

Copyright (c) 2020 TimUntersberger
Copyright (c) 2020-2023 TimUntersberger
Copyright (c) 2024-2025 CKolkey

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
41 changes: 38 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</td>
</tr>
</table>

[![Lua](https://img.shields.io/badge/Lua-blue.svg?style=for-the-badge&logo=lua)](http://www.lua.org)
[![Neovim](https://img.shields.io/badge/Neovim%200.9+-green.svg?style=for-the-badge&logo=neovim)](https://neovim.io)
[![MIT](https://img.shields.io/badge/MIT-yellow.svg?style=for-the-badge)](https://opensource.org/licenses/MIT)
Expand Down Expand Up @@ -55,7 +55,7 @@ neogit.setup {}

The `master` branch will always be compatible with the latest **stable** release of Neovim, and with the latest **nightly** build as well.

Some features may only be available using unreleased (neovim nightly) API's - to use them, set your plugin manager to track the `nightly` branch instead.
Some features may only be available using unreleased (neovim nightly) API's - to use them, set your plugin manager to track the `nightly` branch instead.

The `nightly` branch has the same stability guarantees as the `master` branch.

Expand Down Expand Up @@ -88,7 +88,7 @@ neogit.setup {
},
-- "ascii" is the graph the git CLI generates
-- "unicode" is the graph like https://github.com/rbong/vim-flog
graph_style = "ascii",
graph_style = "ascii",
-- Used to generate URL's for branch popup action "pull request".
git_services = {
["github.com"] = "https://github.com/${owner}/${repository}/compare/${branch_name}?expand=1",
Expand Down Expand Up @@ -137,10 +137,31 @@ neogit.setup {
-- Automatically show console if a command takes more than console_timeout milliseconds
auto_show_console = true,
status = {
show_head_commit_hash = true,
recent_commit_count = 10,
HEAD_padding = 10,
mode_padding = 3,
mode_text = {
M = "modified",
N = "new file",
A = "added",
D = "deleted",
C = "copied",
U = "updated",
R = "renamed",
DD = "unmerged",
AU = "unmerged",
UD = "unmerged",
UA = "unmerged",
DU = "unmerged",
AA = "unmerged",
UU = "unmerged",
["?"] = "",
},
},
commit_editor = {
kind = "auto",
show_staged_diff = true,
},
commit_select_view = {
kind = "tab",
Expand Down Expand Up @@ -245,6 +266,10 @@ neogit.setup {
["<c-c><c-c>"] = "Submit",
["<c-c><c-k>"] = "Abort",
},
commit_editor_I = {
["<c-c><c-c>"] = "Submit",
["<c-c><c-k>"] = "Abort",
},
rebase_editor = {
["p"] = "Pick",
["r"] = "Reword",
Expand All @@ -260,6 +285,12 @@ neogit.setup {
["gj"] = "MoveDown",
["<c-c><c-c>"] = "Submit",
["<c-c><c-k>"] = "Abort",
["[c"] = "OpenOrScrollUp",
["]c"] = "OpenOrScrollDown",
},
rebase_editor_I = {
["<c-c><c-c>"] = "Submit",
["<c-c><c-k>"] = "Abort",
},
finder = {
["<cr>"] = "Select",
Expand All @@ -283,6 +314,7 @@ neogit.setup {
["X"] = "ResetPopup",
["Z"] = "StashPopup",
["b"] = "BranchPopup",
["B"] = "BisectPopup",
["c"] = "CommitPopup",
["f"] = "FetchPopup",
["l"] = "LogPopup",
Expand All @@ -304,6 +336,7 @@ neogit.setup {
["s"] = "Stage",
["S"] = "StageUnstaged",
["<c-s>"] = "StageAll",
["K"] = "Untrack",
["u"] = "Unstage",
["U"] = "UnstageStaged",
["$"] = "CommandHistory",
Expand All @@ -316,6 +349,8 @@ neogit.setup {
["<c-t>"] = "TabOpen",
["{"] = "GoToPreviousHunkHeader",
["}"] = "GoToNextHunkHeader",
["[c"] = "OpenOrScrollUp",
["]c"] = "OpenOrScrollDown",
},
},
}
Expand Down
Loading
Loading