Jesse Duffield
af5b3be286
integrate snake game into lazygit
2022-12-30 12:18:59 +11:00
Jesse Duffield
fb15a2f4f8
Merge pull request #2326 from Ryooooooga/fix-scroll
...
fix https://github.com/jesseduffield/lazygit/issues/2309
2022-12-24 19:20:23 +11:00
Ryooooooga
7bdba1abe4
fix( #2309 ): fix diff scroll
2022-12-20 22:25:49 +09:00
Jesse Duffield
5679efe174
Merge pull request #2239 from bdach/u2f-key-prompts
...
close https://github.com/jesseduffield/lazygit/issues/2230
2022-12-20 21:44:29 +11:00
Arnaud PERALTA
0af63daf18
workingtree controller fixed with new references for commit in staged menu
2022-12-01 09:12:18 +11:00
Arnaud PERALTA
8b894d7bf5
wip: commit logic in helper and reported in files/staging controllers
2022-12-01 09:12:18 +11:00
Jesse Duffield
65d6d7fb2d
fix ignore file keybinding
2022-11-30 19:36:35 +11:00
Bartłomiej Dach
1a1f042f49
Add credential prompts for U2F-backed SSH keys
...
The 8.2 release of OpenSSH added support for FIDO/U2F hardware
authenticators, which manifests in being able to create new types of SSH
key, named `ecdsa-sk` nad `ed25519-sk`. This is relevant to lazygit,
as those SSH keys can be used to authorise git operations over SSH, as
well as signing git commits. Actual code changes are required for
correct support, as the authentication process for these types of keys
is different than the process for types supported previously.
When an operation requiring credentials is initialised with a U2F
authenticator-backed key, the first prompt is:
Enter PIN for ${key_type} key ${path_to_key}:
at which point the user is supposed to enter a numeric (and secret) PIN,
specific to the particular FIDO/U2F authenticator using which the SSH
keypair was generated. Upon entering the correct key, the user is
supposed to physically interact with the authenticator to confirm
presence. Sometimes this is accompanied by the following text prompt:
Confirm user presence for key ${key_type} ${key_fingerprint}
This second prompt does not always occur and it is presumed that the
user will know to perform this step even if not prompted specifically.
At this stage some authenticator devices may also begin to blink a LED
to indicate that they're waiting for input.
To facilitate lazygit's interoperability with these types of keys, add
support for the first PIN prompt, which allows "fetch", "pull", and
"push" git operations to complete.
2022-11-30 13:34:32 +11:00
Ryooooooga
52a2e4c1dc
fix: fix ambiguous branch name
...
test: add an integration test for checkout branch by name
fix: fix full ref name of detached head
refactor: refactor current branch loader
chore: use field name explicitly
2022-11-14 19:05:07 +11:00
Jesse Duffield
b33ec5a050
Merge pull request #1980 from ajhynes7/stash-untracked-changes
2022-11-14 18:46:53 +11:00
sudoburt
3e73dacce3
Merge loaders package into git_commands package
2022-11-14 18:11:45 +11:00
Andrew Hynes
684d1e955e
lint: try deleting blank line
2022-11-13 19:51:30 -03:30
Andrew Hynes
3c436b3457
lint: delete unused argument from handleStashSave
2022-11-13 11:02:06 -03:30
Jesse Duffield
d26350502c
stop switching focus to commits view when resetting
2022-11-13 03:26:50 +00:00
Andrew Hynes
a47e72892a
Merge branch 'master' into stash-untracked-changes
2022-11-01 16:08:34 -02:30
Ryooooooga
3103398e31
chore: refactor rename stash
2022-10-16 09:30:04 +09:00
Ryooooooga
eceb3a5aa6
chore: refactor rename stash
2022-10-16 09:12:43 +09:00
Ryooooooga
11316b7a48
feat: add rename stash
2022-10-16 09:12:42 +09:00
Andrew Hynes
8c46a0110d
Merge branch 'master' into stash-untracked-changes
2022-10-06 22:59:06 -02:30
jiepeng
bc8050d8ac
typo
2022-09-17 15:10:41 -07:00
jiepeng
b8900baf1a
remove deprecated calls
2022-09-17 15:10:41 -07:00
Andrew Hynes
e189546acb
refactor: move checks for clean working tree
2022-09-15 21:48:49 -02:30
Andrew Hynes
c7733aa5e5
refactor: rename method to StashIncludeUntrackedChanges
2022-09-15 21:48:49 -02:30
Andrew Hynes
50cf7ac5bc
refactor: change command order
2022-09-15 21:48:49 -02:30
Andrew Hynes
c7fd218308
fix: add condition to if statement
2022-09-15 21:48:49 -02:30
Andrew Hynes
7ddb80a13e
feat: add stash option to include untracked changes
2022-09-15 21:48:48 -02:30
Luka Markušić
0ff5b74d80
IgnoreOrExclude should be a menu
2022-08-11 14:23:02 +02:00
Jesse Duffield
7410acd1aa
move merge conflicts code into controller
2022-08-07 11:16:03 +10:00
Jesse Duffield
445a625b56
rename merging context to mergeConflicts
2022-08-06 18:05:00 +10:00
Jesse Duffield
524bf83a4a
refactor to only have one context per view
2022-08-06 13:49:11 +10:00
Jesse Duffield
debc58b6c5
fix popup focus issue
2022-08-01 22:09:48 +10:00
Jesse Duffield
682be18507
refactor to use generics for file nodes
...
use less generic names
2022-07-31 19:43:14 +10:00
Jesse Duffield
7077ea428f
add optimistic rendering for staging and unstaging files
2022-07-31 14:34:57 +10:00
Jesse Duffield
95678b1b43
Merge pull request #2065 from jesseduffield/fix-rewording-merge-commit-with-editor
...
Fix rewording a merge commit with editor
2022-07-30 19:51:59 +10:00
Luka Markušić
cc377b5c49
Fix rewording a merge commit with editor
2022-07-30 08:43:42 +02:00
Luka Markušić
1f482e585e
Fix github linter errors
2022-07-30 08:10:29 +02:00
Juan Sanchez Montalvo
11d766053e
Allow adding a file to the .git/info/exclude file
2022-07-05 19:33:44 +10:00
Jesse Duffield
cdec70cc06
Merge pull request #1975 from mark2185/fix-unmatching-remote-branch-name
2022-06-09 20:12:56 +10:00
Jesse Duffield
9591cc381a
support setting the author of a commit
...
update copy
2022-06-09 19:12:20 +10:00
Luka Markušić
55a941d5dc
Fetch the correct remote branch
2022-06-01 20:35:09 +02:00
Ryooooooga
9693afd671
fix: fix lint error
2022-05-18 20:34:35 +09:00
Jesse Duffield
f31dcd3091
Merge pull request #1930 from mark2185/feature/discard-staged-only
2022-05-15 20:33:25 +10:00
Luka Markušić
241d182da7
Make tooltip i18n-able
2022-05-15 12:16:20 +02:00
Ryooooooga
61970a4439
fix: fix ambiguous refname
2022-05-13 21:05:51 +09:00
Luka Markušić
ca191159f5
Discard staged changes only
2022-05-08 14:24:28 +02:00
Jesse Duffield
6f8063217d
rename displayString to label for menu items
2022-05-08 14:26:18 +10:00
Jens Pfeifle
7c573a5bea
Add command to reset the commit author from the commits panel.
2022-05-08 13:29:56 +10:00
Jesse Duffield
f257740ea7
add tooltip view for showing menu item descriptions
2022-05-08 13:24:36 +10:00
Jesse Duffield
0940e0182b
Merge pull request #1870 from mark2185/feature/stash-unstaged
2022-05-06 20:17:33 +10:00
Jesse Duffield
f7fae0b82e
Merge pull request #1869 from mark2185/feature/unset-upstream
2022-05-06 20:14:13 +10:00
