1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-27 00:51:18 +02:00
Commit Graph

174 Commits

Author SHA1 Message Date
51a558040d Fix the title and text (and variable names) of the Discard Changes prompt
The title was saying "Unstage lines", which was just wrong. The text said
"Delete lines", which can be seen as a bit misleading; we are only discarding
the changes to the selected lines, not deleting the lines themselves.

For consistency, rename the config variable skipUnstageLineWarning accordingly.
2023-06-26 08:15:35 +02:00
77c5d1761d Add nerdFontsVersion config 2023-06-15 21:47:52 +02:00
a4db44bc3d show commits against branches 2023-06-01 19:21:24 +10:00
31a2ea1f19 Add --all to "git fetch" command when not fetching a specific remote 2023-06-01 10:13:14 +02:00
036a1ea519 Support suggestions generated from command in custom commands
This changes the interface a bit but it was only added earlier today so I doubt anybody is dependent on it yet.

I'm also updating the docs.
2023-05-29 22:47:35 +10:00
16fa22a36e Add suggestionsPreset to custom commands system 2023-05-29 14:24:49 +10:00
0e0458f355 More compact and flexible date format
You can now configure both a time format and a short time format, where the short format kicks in
when the time is within the last day
2023-05-26 17:31:39 +10:00
46b93bba0e Add config git.mainBranches
It defaults to {"master", "main"}, but can be set to whatever branch names
are used as base branches, e.g. {"master", "devel", "v1.0-hotfixes"}. It is
used for color-coding the shas in the commit list, i.e. to decide whether
commits are green or yellow.
2023-05-16 13:20:03 +02:00
fba1a2b5ac Add config gui.experimentalShowBranchHeads
People find the new (*) display for branch heads in the commits list confusing,
so make it opt-in for now.
2023-05-02 18:58:54 +10:00
49da7b482d Split commit message panel into commit summary and commit description panel
When we use the one panel for the entire commit message, its tricky to have a keybinding both for adding a newline and submitting.
By having two panels: one for the summary line and one for the description, we allow for 'enter' to submit the message when done from the summary panel,
and 'enter' to add a newline when done from the description panel. Alt-enter, for those who can use that key combo, also works for submitting the message
from the description panel. For those who can't use that key combo, and don't want to remap the keybinding, they can hit tab to go back to the summary panel
and then 'enter' to submit the message.

We have some awkwardness in that both contexts (i.e. panels) need to appear and disappear in tandem and we don't have a great way of handling that concept,
so we just push both contexts one after the other, and likewise remove both contexts when we escape.
2023-04-30 12:17:34 +10:00
e4e16fa38e Change OpenCommand to Open and OpenLinkCommand to OpenLink
We do this for consistency with the edit settings. The old names are kept as a
fallback for now.
2023-04-13 13:14:00 +02:00
b7e029adc7 Don't set platform defaults on OSConfig struct immediately
Instead, query the platform defaults only if the config is empty. This will be
necessary later to distinguish an empty config from a default config, so that we
can give deprecation warnings.
2023-04-13 13:14:00 +02:00
659d668e16 Implement edit presets 2023-04-13 13:14:00 +02:00
7bbcec965b Cleanup: fix copy/paste error in comment 2023-04-13 13:14:00 +02:00
a82d952f48 Merge pull request #2495 from jesseduffield/feature/remove-altreturn 2023-03-20 20:11:35 +11:00
b5d612e6d6 Add border config (#2344)
Co-authored-by: yk-kd <yosuke.komada@gmail.com>
2023-03-18 11:23:31 +11:00
f314cb3763 Remove alternative confirmation and return keymappings 2023-03-09 10:32:00 +01:00
56424eb1aa remove x keybinding for opening menu so we now only use '?' 2023-02-20 19:28:45 +11:00
0b55eaca1d add create tag from commit test 2023-02-20 19:01:08 +11:00
67b08ac239 feat: support to create tag on branch 2023-02-19 23:31:46 +09:00
bff076c70a rename key to Pull 2023-02-19 11:42:00 +11:00
35c5f940a4 Fixing indent in user_config.go 2023-02-01 09:50:37 +05:30
01f0efb997 Merge branch 'master' into #2319_default_screen_mode 2023-01-29 10:25:14 +05:30
stk
67fb28e2b8 Add user config gui.skipRewordInEditorWarning 2023-01-26 09:01:22 +01:00
a11e91e651 replaced 'screenMode' to 'windowSize' in config 2023-01-16 20:07:21 +05:30
f4ccb68464 Added screenMode configuration to gui configuration 2023-01-11 16:51:46 +05:30
965f7bfcb2 feat(config): change git.commit.verbose to accept "default" 2023-01-06 11:15:33 +09:00
d98130c3ef Add option to allow --verbose commit in editor commits 2023-01-01 02:01:04 +01:00
f3fa9ec2d1 Merge pull request #2311 from wakaka6/add_return_alt1 2022-12-28 11:54:16 +11:00
ac127f017e chore(config): remove unused config 2022-12-26 16:14:30 +09:00
b6c73b3620 Change null as the default return-alt1 2022-12-20 21:39:24 +08:00
6386a03805 add return alt1 2022-12-11 15:44:25 +08:00
65d6d7fb2d fix ignore file keybinding 2022-11-30 19:36:35 +11:00
37997dcbcd [#2279] defaultFgColor entry in theme config 2022-11-21 21:48:18 +01:00
1ac3ae1ad1 use better colour defaults 2022-11-12 14:59:15 +11:00
11316b7a48 feat: add rename stash 2022-10-16 09:12:42 +09:00
7e9dffe1b9 Add Key field to CustomCommandPrompt struct
Add Form field to CustomCommandObjects struct

Write user prompts responses to Form field

Ensure that map keys exists

Add form prompts integration test

Remove redundant index
2022-09-17 14:58:44 -07:00
9c0d860980 basic custom command test 2022-08-14 20:49:20 +10:00
e1f41b653c Add showOutput option to custom commands (#1163) 2022-07-28 18:40:30 +08:00
c087dca60a Merge pull request #2027 from jesseduffield/gozes-jesse
Attempt at fixing CI
2022-07-05 19:37:09 +10:00
11d766053e Allow adding a file to the .git/info/exclude file 2022-07-05 19:33:44 +10:00
39ba397cf7 Update pkg/config/user_config.go 2022-07-04 11:36:18 -07:00
9d304098bb feat: add confirm prompt for custom keybindings
- Supports configuring a custom confirmation prompt via `config.yml` for
  custom keybindings. A new `CustomCommandPrompt.Body` field is
  used to store the immutable body text of the confirmation popup.
- Adds a sample 'confirm' prompt to the example `config.yml`.
- Updates the `Prompts` section of the documentation to include
  'confirm' prompt type and also describe which fields pertain to it
  (i.e. `initialValue`).

Closes: https://github.com/jesseduffield/lazygit/issues/1858

Signed-off-by: Michael Mead <mmead.developer@gmail.com>
2022-07-04 11:36:13 -07:00
Lay
684ea284af fix: lint error 2022-05-30 23:19:48 +08:00
Lay
666180cfd0 Add config param that displays the whole git graph by default 2022-05-30 13:52:39 +08:00
1f1d871837 feat: add ability to customize time format 2022-05-18 20:55:27 +09:00
1ef585969f add option to always show unstaged/staged panels 2022-05-08 17:24:55 +09:00
7c573a5bea Add command to reset the commit author from the commits panel. 2022-05-08 13:29:56 +10:00
d458e78d95 feat: add ability to edit hunk 2022-05-06 21:53:00 +09:00
b07aeda5a6 feat(gui): show file icons 2022-04-23 12:25:40 +09:00