go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-16 11:37:01 +02:00
Code Issues Releases Activity
4,466 Commits 45 Branches 211 Tags 192 MiB
4b2622d93b
Commit Graph

4466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
README-bot
41b00c8313 Updated README.md 2023-06-22 16:55:20 +00:00
Stefan Haller
06892cb0ac
Merge pull request #2731 from jesseduffield/config-for-nerd-fonts-version 
Add config for nerd fonts version
 2023-06-22 18:55:05 +02:00
Stefan Haller
77c5d1761d Add nerdFontsVersion config 2023-06-15 21:47:52 +02:00
Stefan Haller
6ab5d7f69b Turn remoteIcons into a map 
We don't actually use it to do map lookups; we still iterate over it in the same
way as before. However, using a map makes it easier to patch elements; see the
next commit.
 2023-06-15 13:25:32 +02:00
Jesse Duffield
c410d26006
Merge pull request #2717 from jesseduffield/jesseduffield-patch-1 2023-06-08 11:09:28 +10:00
Jesse Duffield
db1fd85e12
Update README.md 2023-06-08 10:33:08 +10:00
Stefan Haller
1489a31e48
Merge pull request #2712 from stefanhaller/discard-changes-only-from-local-commits 
Allow discarding changes only from local commits
 2023-06-07 16:40:56 +02:00
Stefan Haller
1f42c8a387 Allow discarding changes only from local commits 
We use CommitFilesController also for the files of commits that we show
elsewhere, e.g. for branch commits, tags, or stashes. It doesn't make sense to
discard changes from those (for stashes it might be possible to implement it
somehow, but that would be a new feature), so we disallow it unless we are in
the local commits panel.
 2023-06-07 12:48:56 +02:00
Stefan Haller
e229e26fbe
Merge pull request #2707 from stefanhaller/better-prompt-for-discarding-old-file-changes 
Better prompt for discarding old file changes
 2023-06-07 12:47:19 +02:00
Stefan Haller
5c55ce6555 Better prompt for discarding old file changes 
Lazygit knows what kind of file change this is, so there doesn't have to be any
"if" in the prompt text.
 2023-06-07 12:47:03 +02:00
Stefan Haller
1f801b91e4 Disallow discarding file changes while a directory is selected 
Discarding changes to an entire directory doesn't quite work correctly in all
cases; for example, if the current commit added files to the directory (but the
directory existed before) then those files won't be removed.

It might be possible to fix the command so that these cases always work for
directories, but I don't think it's worth the effort (you can always use a
custom patch for that), so let's display an error for now.
 2023-06-07 12:47:03 +02:00
Jesse Duffield
0080684c7c
Merge pull request #2715 from jesseduffield/recent-repos 2023-06-07 18:33:05 +10:00
Jesse Duffield
c92e687d3b Fix focus issue when opening recent-repos menu at launch 
I don't know why we were setting the initial context to CurrentSideContext
and not just CurrentContext in the first place. If there is no current context
in either case it'll default to the files context. So the only issue is if
we anticipated that some random context would be focused and we didn't want to
activate that. But I can't think of any situation where that would happen.
 2023-06-07 18:27:18 +10:00
Jesse Duffield
b6a31369da
Merge pull request #2714 from jesseduffield/author-suggestions-custom-commands 2023-06-07 17:21:03 +10:00
Jesse Duffield
a694c458dd Support authors and tags in custom command suggestions preset 2023-06-07 10:18:01 +10:00
README-bot
ced773ab18 Updated README.md 2023-06-05 13:19:01 +00:00
Stefan Haller
a741b81b21
Merge pull request #2708 from enricozb/patch-1 
fix kakoune binary name
 2023-06-05 15:18:45 +02:00
Enrico Borba
cbbb281011
kakoune binary name 2023-06-05 08:53:39 -04:00
README-bot
e6fc332748 Updated README.md 2023-06-03 05:56:51 +00:00
Jesse Duffield
042ab2f99a
Merge pull request #2704 from jesseduffield/int-matchers 2023-06-03 15:56:34 +10:00
Jesse Duffield
a9ae5063c2 Fix flakey test 
Whenever we perform an action in a test, we should assert on the result before doing the next action.
This prevents issues where the test moves too fast for our code. It would be nice to not have to do this,
but for now that's the situation
 2023-06-03 15:54:03 +10:00
Jesse Duffield
1932c2366b Appease linter 2023-06-03 15:54:03 +10:00
Jesse Duffield
dd34adb36c Support matchers on integers in integration tests 2023-06-03 15:32:23 +10:00
Jesse Duffield
e98935f83e
Merge pull request #2699 from jesseduffield/revert-hide-underscores 2023-06-01 22:30:56 +10:00
Jesse Duffield
75293ff572
Merge pull request #2700 from jesseduffield/refresh-commits-viewport-on-focus-lost 2023-06-01 22:30:45 +10:00
Jesse Duffield
4ff02bd3b7 Add integration test for commit highlighting on focus 
A better refactor would be to allow matchers to assert against either a string or a slice of cells, so that I could have
the same ergonomics that I have elsewhere, but this is a start.
 2023-06-01 22:20:30 +10:00
Jesse Duffield
5df27c61ed Apply correct styling to root commit in graph 
The root commit is special in that it has no parents. So we need to add a pipe that's headed for a commit
that doesn't actually exist i.e. the mythical empty tree commit. We're using the actual hash of that
pseudo-commit, but it's not being read anywhere.
 2023-06-01 22:20:30 +10:00
Jesse Duffield
c9136538b5 Refresh commits viewport on focus lost 
We don't want the highlighted selection sticking around after the context loses focus.
 2023-06-01 21:31:57 +10:00
Jesse Duffield
b250644ea8 Stop hiding underscores for VSCode 
VSCode had an issue in their terminal where underscores were printed all over the place.
That has now been fixed.
See https://github.com/jesseduffield/lazygit/issues/2294 and https://github.com/xtermjs/xterm.js/issues/4238
 2023-06-01 20:12:20 +10:00
Jesse Duffield
caab31ff38
Merge pull request #2274 from jesseduffield/show-commit-against-branch 2023-06-01 19:25:00 +10:00
Jesse Duffield
a4db44bc3d show commits against branches 2023-06-01 19:21:24 +10:00
Jesse Duffield
4b3f8055d0
Merge pull request #2696 from jesseduffield/default-to-default 2023-06-01 19:08:52 +10:00
Jesse Duffield
378c50cf30 Set defaults colours to 'default', not 'white' 
'white' is great on dark themes, and terrible on light themes.
 2023-06-01 18:59:04 +10:00
Jesse Duffield
860fd23b42
Merge pull request #2695 from jesseduffield/fix-time-ago-function 2023-06-01 18:53:55 +10:00
Stefan Haller
33e5f8f776
Merge pull request #2694 from stefanhaller/conflict-handling-menu 
Show menu instead of prompt when there are conflicts in a rebase or merge
 2023-06-01 10:52:11 +02:00
Stefan Haller
16dceb813b Show menu instead of prompt when there are conflicts in a rebase or merge 
This solves the issue that previously you could too easily abort a rebase
accidentally by hitting escape.
 2023-06-01 10:51:48 +02:00
Jesse Duffield
61f00e6dd4 update seconds ago function and add tests 2023-06-01 18:48:06 +10:00
Stefan Haller
523be47865
Merge pull request #2692 from stefanhaller/fetch-all 
Add --all to "git fetch" command, unless disabled by config.
 2023-06-01 10:14:45 +02:00
Stefan Haller
31a2ea1f19 Add --all to "git fetch" command when not fetching a specific remote 2023-06-01 10:13:14 +02:00
Stefan Haller
697157f5d5 Add tests for Fetch 2023-05-31 15:54:20 +02:00
Stefan Haller
ee4b9d20b1 Extract a FetchCmdObj function so that we can test it 
No change in behavior.
 2023-05-31 15:54:20 +02:00
Stefan Haller
a2bdab2135 Remove unused fetch options RemoteName and BranchName 
These were never used, since there are separate functions for fetching a remote
and for fast-forwarding a branch.
 2023-05-31 15:54:20 +02:00
README-bot
c70c8e84f8 Updated README.md 2023-05-30 23:36:29 +00:00
Jesse Duffield
614a30134c
Merge pull request #2688 from tzengyuxio/master 2023-05-31 09:36:12 +10:00
Tzeng Yuxio
6754335b26
Add key bindings doc for Chinese 2023-05-30 20:30:30 +08:00
Jesse Duffield
d29b3e372e
Merge pull request #2690 from jesseduffield/remove-ufizzi 2023-05-30 18:04:25 +10:00
Jesse Duffield
33789d67f0
Merge pull request #2490 from jesseduffield/dependabot/go_modules/golang.org/x/net-0.7.0 2023-05-30 17:56:18 +10:00
Jesse Duffield
01b3e8e8bb Remove Uffizzi 
We've given Uffizzi a go but haven't found  utility in it, so we're removing it.
 2023-05-30 17:54:09 +10:00
Jesse Duffield
cc0edd42bb
Merge pull request #2508 from Ryooooooga/remove-jesseduffield-yaml 2023-05-30 17:39:25 +10:00
Jesse Duffield
237dde598c
Merge pull request #2686 from jesseduffield/custom-command-suggestions-from-commands 2023-05-30 16:44:48 +10:00