index
:
lazygit
adapt-pr-template
assets
better-custom-command-models
box-view-padding
bronze
checkout-by-name
context-manager-cleanups
convert-translation-sets-to-json
copper
create-pull-request/patch
crowdin
custom-command-output-title
delete-and-edit-custom-commands-history-items
dependabot/go_modules/golang.org/x/crypto-0.1.0
dependabot/go_modules/golang.org/x/net-0.17.0
disallow-opening-menu-when-search-prompt-is-active
divergence-from-base-branch-command
divergence-from-base-branch-display
ensure-test-list-correctness
fast-ancestor-check
feature/open-file-without-specified-line
fix-clicking-in-status-panel
fix-custom-commands-in-per-repo-config
fix-deadlock-reporting
fix-duplicate-options-map-entries
fix-go-generate-on-windows
fix-highlight-in-staging-panel
fix-linter-warnings
fix-loading-commits-with-very-long-subjects
fix-loading-translation-file-on-windows
fix-open-PR/double/escape
fix-pty-layout-problems
fix-range-select-in-staging-view
fix-skip-hook
fix-sponsors
fix-stale-content-with-overwriteLines
fix-support-for-old-style-non-interactive-rebase
fix-tooltip-for-fixup
gh-integration-2
gh-integration-3
github-release-notes
improve-find-base-commit-for-fixup
improve-find-base-commit-for-fixup-for-hunks-on-master
improve-mouse-support-for-commit-message-panel
integration-tests-on-windows
keybinding-menu-headings
lazygit-crash-course
make-author-length-configurable
make-author-length-configurable-2
make-auto-staging-resolved-files-optional
mark-last-commit-to-change-file
master
menu-prompt
more-section-headers
move-commits-to-new-branch
per-repo-config-files
prompt-to-stage-files-after-resolving-conflicts
rebase-onto-base-branch
rebase-onto-base-branch-jesse
release-notes
rename-custom-command-to-shell-command
render-graph-for-divergence-log
run-integration-tests-on-windows
search-the-model-instead-of-the-view
show-current-option-in-menus
show-merged-status
show-sync-status-in-branches-panel-jesse
smaller-git-builder
support-hyperlinks
support-triangular-workflow
switch-tabs-with-panel-jump-keys
test-m-keybinding
update-keybinding-names
upstream-test
use-interactive-shell-for-custom-commands
worktree-support-2
writing-integration-test-result-to-file
Mirror of https://github.com/jesseduffield/lazygit
matthias
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
Diffstat
-rw-r--r--
pkg/gui/modes.go
11
-rw-r--r--
pkg/i18n/english.go
4
-rw-r--r--
pkg/integration/components/assert.go
2
-rw-r--r--
pkg/integration/components/input.go
5
-rw-r--r--
pkg/integration/tests/branch/rebase.go
47
-rw-r--r--
pkg/integration/tests/branch/rebase_and_drop.go
3
-rw-r--r--
pkg/integration/tests/cherry_pick/cherry_pick.go
66
-rw-r--r--
pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go
87
-rw-r--r--
pkg/integration/tests/shared/README.md
1
-rw-r--r--
pkg/integration/tests/shared/conflicts.go
49
-rw-r--r--
pkg/integration/tests/tests.go
8
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/COMMIT_EDITMSG
15
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/HEAD
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/ORIG_HEAD
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/REBASE_HEAD
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/index
bin
1356 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/logs/HEAD
40
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/base_branch
3
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/develop
5
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking
9
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/master
5
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/other_branch
3
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe
bin
158 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d
bin
112 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2
4
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09
bin
34 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c
bin
177 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
bin
21 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7
bin
66 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6d
bin
153 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca
bin
50 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77
bin
144 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0
bin
208 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af
bin
117 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885
bin
66 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4
bin
327 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce587
3
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420
bin
121 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8
bin
150 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e7831
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd
bin
120 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c
bin
252 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180
3
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/5d/2484f3cb6ce658e296526c48e1a376b2790dfc
bin
147 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0
bin
33 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3
bin
86 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6
bin
54 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9
bin
66 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/65/c0438e428cd1aa94588eaa52eb7ebad7ec62fd
bin
168 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/68/728b56ed31d03ca94496b9e2a45c62ba0f4e8f
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4
bin
156 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98
bin
233 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54
bin
328 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547
3
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d
bin
66 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8
bin
65 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd
bin
66 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c
bin
358 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048
bin
154 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242
bin
54 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
bin
21 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c
bin
66 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520
bin
66 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722
bin
162 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e
bin
254 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58
bin
277 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68
bin
183 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993
bin
303 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4
bin
201 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe2361203368
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0
bin
227 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
bin
21 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e
bin
50 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511
bin
66 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439
bin
86 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d
bin
361 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7
bin
66 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7
bin
162 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2
bin
144 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4
bin
54 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/f4/ffac820a371104fe611d81bc13a45b70a3ebb3
bin
158 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/fa/cb56c48e4718f71c08116153c93d87bc699671
2
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007
bin
352 -> 0 bytes
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/base_branch
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/develop
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/feature/cherry-picking
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/master
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/other_branch
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/cherrypicking3
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/cherrypicking4
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/cherrypicking5
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/directory/file
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/directory/file2
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/file
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/file1
63
-rw-r--r--
test/integration/cherryPicking/expected/repo/file3
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/file4
1
-rw-r--r--
test/integration/cherryPicking/expected/repo/file5
1
-rw-r--r--
test/integration/cherryPicking/recording.json
1
-rw-r--r--
test/integration/cherryPicking/setup.sh
157
-rw-r--r--
test/integration/cherryPicking/test.json
1
-rw-r--r--
test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/COMMIT_EDITMSG
1
-rw-r--r--
test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/FETCH_HEAD
(renamed from test/integration/cherryPicking/expected/repo/.git_keep/FETCH_HEAD)
0
-rw-r--r--
test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/HEAD
1
-rw-r--r--
test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/ORIG_HEAD
1
-rw-r--r--
test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/config
(renamed from test/integration/cherryPicking/expected/repo/.git_keep/config)
2
-rw-r--r--
test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/description
(renamed from test/integration/cherryPicking/expected/repo/.git_keep/description)
0
-rw-r--r--
test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/index
bin
0 -> 65 bytes
-rw-r--r--
test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/info/exclude
(renamed from test/integration/cherryPicking/expected/repo/.git_keep/info/exclude)
0