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
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
mark-last-commit-to-change-file
master
menu-prompt
more-section-headers
per-repo-config-files
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/commands/git_commands/rebase.go
35
-rw-r--r--
pkg/gui/controllers/local_commits_controller.go
6
-rw-r--r--
pkg/integration/tests/interactive_rebase/move.go
84
-rw-r--r--
pkg/integration/tests/interactive_rebase/move_in_rebase.go
96
-rw-r--r--
pkg/integration/tests/interactive_rebase/one.go
71
-rw-r--r--
pkg/integration/tests/interactive_rebase/rebase.go
122
-rw-r--r--
pkg/integration/tests/interactive_rebase/reword_first_commit.go
3
-rw-r--r--
pkg/integration/tests/interactive_rebase/reword_last_commit.go
38
-rw-r--r--
pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go
126
-rw-r--r--
pkg/integration/tests/interactive_rebase/swap_with_conflict.go
33
-rw-r--r--
pkg/integration/tests/tests_gen.go
7
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/COMMIT_EDITMSG
30
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/FETCH_HEAD
0
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/HEAD
1
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/ORIG_HEAD
1
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/config
10
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/description
1
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/index
bin
353 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/info/exclude
7
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/logs/HEAD
9
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/logs/refs/heads/master
5
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf
bin
155 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442
bin
50 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97
bin
127 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3ee
bin
148 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef
bin
146 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c
bin
101 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641
2
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758
3
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c
bin
119 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edc
bin
147 -> 0 bytes
-rw-r--r--
test/integration/rebase/expected/repo/.git_keep/refs/heads/master
1
-rw-r--r--
test/integration/rebase/expected/repo/file0
1
-rw-r--r--
test/integration/rebase/expected/repo/file1
1
-rw-r--r--
test/integration/rebase/expected/repo/file2
1
-rw-r--r--
test/integration/rebase/expected/repo/file4
1
-rw-r--r--
test/integration/rebase/recording.json
1
-rw-r--r--
test/integration/rebase/setup.sh
26
-rw-r--r--
test/integration/rebase/test.json
1
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/COMMIT_EDITMSG
16
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/FETCH_HEAD
0
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/HEAD
1
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG
4
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/ORIG_HEAD
1
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/REBASE_HEAD
1
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/config
10
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/description
1
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/index
bin
429 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/info/exclude
7
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/logs/HEAD
10
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/logs/refs/heads/master
7
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442
bin
50 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3
3
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97
bin
127 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf
bin
147 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4
2
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be
bin
65 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c
bin
101 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205
bin
71 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c
bin
153 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94
bin
161 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45
bin
158 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948
bin
127 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641
2
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264
2
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2
bin
127 -> 0 bytes
-rw-r--r--
test/integration/rebase2/expected/repo/.git_keep/refs/heads/master
1
-rw-r--r--
test/integration/rebase2/expected/repo/file0
1
-rw-r--r--
test/integration/rebase2/expected/repo/file1
1
-rw-r--r--
test/integration/rebase2/expected/repo/file2
1
-rw-r--r--
test/integration/rebase2/expected/repo/file4
1
-rw-r--r--
test/integration/rebase2/recording.json
1
-rw-r--r--
test/integration/rebase2/setup.sh
34
-rw-r--r--
test/integration/rebase2/test.json
1
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/COMMIT_EDITMSG
27
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/FETCH_HEAD
0
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/HEAD
1
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/ORIG_HEAD
1
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/config
10
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/description
1
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/index
bin
353 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/info/exclude
7
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/logs/HEAD
12
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/logs/refs/heads/master
7
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442
bin
50 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e
bin
154 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97
bin
127 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc
bin
154 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c
bin
147 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26
bin
155 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292
bin
154 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9
bin
158 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c
bin
101 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948
bin
127 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641
2
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530
bin
150 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
bin
21 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac
4
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866
bin
118 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2
bin
127 -> 0 bytes
-rw-r--r--
test/integration/rebase3/expected/repo/.git_keep/refs/heads/master
1
-rw-r--r--
test/integration/rebase3/expected/repo/file0
1
-rw-r--r--
test/integration/rebase3/expected/repo/file1
1
-rw-r--r--
test/integration/rebase3/expected/repo/file2
1
-rw-r--r--
test/integration/rebase3/expected/repo/file4
1
-rw-r--r--
test/integration/rebase3/recording.json
1
-rw-r--r--
test/integration/rebase3/setup.sh
34
-rw-r--r--
test/integration/rebase3/test.json
1
-rw-r--r--
test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/COMMIT_EDITMSG
24
-rw-r--r--
test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/FETCH_HEAD
0
-rw-r--r--
test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/HEAD
1
-rw-r--r--
test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/ORIG_HEAD
1
-rw-r--r--