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-fixup-in-current-branch
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
update-language-files-from-crowdin
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
path:
root
/
test
/
integration
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
(limited to 'test/integration')
-rw-r--r--
test/integration/mergeConflicts/config/config.yml
5
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG
36
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/FETCH_HEAD
0
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/HEAD
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/config
10
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/description
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/index
bin
1814 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude
7
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/logs/HEAD
34
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/base_branch
3
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/develop
5
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking
9
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/master
5
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/other_branch
3
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d
bin
112 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/0b/2387a3f67ec050f6d4e08f379e3cbb0a9913f1
bin
148 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/16/18ce1085acb41fd710e279ac38911aadfb0a09
bin
121 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09
bin
34 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c
bin
177 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
bin
21 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7
bin
66 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca
bin
50 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89
4
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77
bin
144 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af
bin
117 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885
bin
66 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/24/10ee12b940bade9d9e99413732faa6dc60adb1
bin
34 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4
bin
327 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/27/94411aa7b73b44f533fb862cdb9dbfd13c5d92
bin
145 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8
bin
150 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71
bin
80 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/34/1cf8213827614a274c750cd7dec4307eb41de7
bin
153 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd
bin
120 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c
bin
252 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800
2
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/49/7b1e236588f0e2674c9a5787abeb226abf3680
bin
407 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839
3
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503
6
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/56/2af0640203fb5a6e92c090d8d1ded26806d2c4
bin
147 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/874a902548f753e50944827e572a7470aa9731
bin
107 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/5d/a4d9200457542d875fe4def54ac98c16332db0
bin
33 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3
bin
86 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6
bin
54 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/01e935461d4cd862ae4a720846e87880d198b9
bin
66 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf
2
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54
bin
328 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d
bin
66 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8
bin
65 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd
bin
66 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e
bin
48 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c
bin
358 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242
bin
54 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9
2
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b
4
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
bin
21 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c
bin
66 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/b0/753bdba91b84e3f406e21dbc7deba8e98f1fc8
bin
153 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a
3
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520
bin
66 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58
bin
277 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/cc/19bee93215b6c20ab129fb2c006762d4ae1497
bin
155 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993
bin
303 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64
3
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4
bin
201 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0
bin
227 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa
3
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/2c0daa40dcba0dded361a25ff7806b13db59a6
bin
154 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
bin
21 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e
bin
50 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511
bin
66 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439
bin
86 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118
2
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d
bin
361 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7
bin
66 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/ed/d4e2e50eb82125428b045c540a9194d934e180
bin
154 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2
bin
144 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4
bin
54 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/f7/f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e
bin
163 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/f8/9097f0bd23eda6d8977c0edfae7f913ffc5db3
bin
158 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007
bin
352 -> 0 bytes
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/base_branch
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/develop
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/feature/cherry-picking
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/master
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/other_branch
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/cherrypicking1
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/cherrypicking2
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/cherrypicking3
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/cherrypicking4
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/cherrypicking5
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/cherrypicking6
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/cherrypicking7
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/cherrypicking8
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/cherrypicking9
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/directory/file
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/directory/file2
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/file
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/file1
63
-rw-r--r--
test/integration/mergeConflicts/expected/repo/file3
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/file4
1
-rw-r--r--
test/integration/mergeConflicts/expected/repo/file5
1
-rw-r--r--
test/integration/mergeConflicts/recording.json
1
-rw-r--r--
test/integration/mergeConflicts/setup.sh
158
-rw-r--r--
test/integration/mergeConflicts/test.json
1
-rw-