Jesse Duffield
9f71ed6c41
Merge pull request #2432 from Ryooooooga/remove-unknown-view-error-msg
2023-02-11 10:51:49 +11:00
Ryooooooga
984eb95cb7
chore: remove UNKNOWN_VIEW_ERROR_MSG
2023-02-10 21:26:51 +09:00
stk
1da762c295
Explicitly pass --no-autosquash when rebasing
...
This fixes the problem shown in the previous commit.
2023-02-09 18:21:11 +01:00
stk
e357c00d4d
Add an integration test showing a problem with autosquash during normal rebase
...
For users who have the rebase.autoSquash git config set to true, any regular
rebase will squash fixups in addition to rebasing. Not good -- we'll fix that in
the next commit.
2023-02-09 17:35:20 +01:00
Ryooooooga
1be6c522d8
fix: disable menu key binding while displaying popup
2023-02-09 20:13:41 +09:00
Luka Markušić
8af59c3e6e
Copy remote branch name to clipboard
2023-02-09 11:56:12 +01:00
Jesse Duffield
c713d19383
Merge pull request #2417 from stefanhaller/make_integration_tests_more_robust
2023-02-09 21:55:30 +11:00
Jesse Duffield
4f7324bad0
Merge pull request #2413 from stefanhaller/allow-ignore-whitespace-everywhere
2023-02-09 21:55:12 +11:00
README-bot
aed3d56840
Updated README.md
2023-02-09 10:48:48 +00:00
Jesse Duffield
3745ba506b
Merge pull request #2428 from jesseduffield/fix-linting
2023-02-09 21:48:28 +11:00
Jesse Duffield
5e2254395a
fix linting issue
2023-02-09 21:45:14 +11:00
stk
b243f30f48
Disable ~/.gitconfig when running integration tests
...
A global ~/.gitconfig file can have influence on how integration tests behave;
in my case, I had the option "merge.conflictStyle" set to "diff3", which made
the integration test "cherry_pick_conflict" fail because the diff was different
from what the test expected.
Make this more robust by telling git to ignore the global config file when
running tests.
2023-02-07 17:26:45 +01:00
stk
e57843d947
Add integration test for ignoring whitespace in diff
2023-02-07 13:33:10 +01:00
stk
5bb6198219
Allow ignoring whitespace in diff in commits panel
2023-02-07 12:14:29 +01:00
stk
bbaeab68e1
Better redrawing after toggling "ignore whitespace"
...
There's no need for refreshing anything; all that's needed is to re-focus the
selected list item. This way it will also work in other panels, which we are
about to add in the next commit.
2023-02-07 12:09:17 +01:00
stk
946c1dff99
Cleanup: remove extra space
2023-02-07 12:09:15 +01:00
stk
d838965a41
Make "Toggle whitespace in diff view" a global key binding
...
Since it is going to affect a number of views later in the branch, it's easier
to make it global than to find all views that are affected.
2023-02-07 09:25:38 +01:00
Jesse Duffield
469938ee9b
Merge pull request #2342 from knutwalker/override-git-sequence-editor-for-rebase
2023-02-05 13:52:35 +11:00
README-bot
f7af2b991d
Updated README.md
2023-02-04 23:30:57 +00:00
Jesse Duffield
75c3ab8a4a
Merge pull request #2411 from Ryooooooga/default-color
...
fix https://github.com/jesseduffield/lazygit/issues/2410
2023-02-05 10:30:42 +11:00
Ryooooooga
7bd0c779c7
fix: fix default color to be white
2023-02-03 23:36:59 +09:00
README-bot
16802a048e
Updated README.md
2023-02-01 10:52:32 +00:00
Jesse Duffield
c0e805718d
Merge pull request #2358 from phanithinks/#2319_default_screen_mode
2023-02-01 21:52:09 +11:00
Phanindra kumar Paladi
35c5f940a4
Fixing indent in user_config.go
2023-02-01 09:50:37 +05:30
README-bot
77093451d4
Updated README.md
2023-01-31 06:03:06 +00:00
Jesse Duffield
368d6437b8
Merge pull request #2373 from phanithinks/clipboard_patch_option_2357
2023-01-31 17:02:46 +11:00
Phanindra Kumar Paladi
01f0efb997
Merge branch 'master' into #2319_default_screen_mode
2023-01-29 10:25:14 +05:30
Phanindra kumar Paladi
d0851113d1
Skipping copy_patch_to_clipboard test case
2023-01-29 10:20:56 +05:30
Phanindra kumar Paladi
df58c75ca4
Fixed breaking integrtion tests(old)
2023-01-29 10:03:59 +05:30
Jesse Duffield
d8c7d47067
Merge pull request #2395 from stefanhaller/trailing-lf-when-copying-diff-lines
2023-01-29 14:19:29 +11:00
Jesse Duffield
f79a8c281f
Merge pull request #2398 from Ryooooooga/fix-detached-head
...
fix https://github.com/jesseduffield/lazygit/issues/1467
2023-01-29 14:19:05 +11:00
Jesse Duffield
996a1e469f
Merge pull request #2401 from Ryooooooga/disable-log-order
2023-01-29 14:05:31 +11:00
README-bot
9d5d61260a
Updated README.md
2023-01-29 02:43:45 +00:00
Jesse Duffield
18db5eafd4
Merge pull request #2384 from stefanhaller/disable-reword-in-editor-prompt
2023-01-29 13:43:23 +11:00
Ryooooooga
2183c157d4
feat(log): allow to disable git.log.order
2023-01-28 21:17:05 +09:00
Ryooooooga
5dec080719
fix: fix RefName of detached HEAD to works in Chinese
2023-01-27 20:45:18 +09:00
stk
fc38e3b54d
Don't omit final line feed when copying diff lines to clipboard
2023-01-26 10:30:05 +01:00
stk
93d845cb01
Cleanup: remove unused function RenderPlain
2023-01-26 10:30:05 +01:00
stk
67fb28e2b8
Add user config gui.skipRewordInEditorWarning
2023-01-26 09:01:22 +01:00
Jesse Duffield
679b0456f3
Merge pull request #2388 from Ryooooooga/remove-unused-texts
2023-01-26 13:46:01 +11:00
Jesse Duffield
f7f24dbfc1
better test
2023-01-26 13:25:56 +11:00
Jesse Duffield
b942df02a1
Merge pull request #2376 from Ryooooooga/fix-resolve-placeholder
2023-01-26 13:03:19 +11:00
Jesse Duffield
f12a2edefa
Merge pull request #2372 from Ryooooooga/fix-installation-ubuntu
2023-01-26 12:58:49 +11:00
README-bot
7e54b5641f
Updated README.md
2023-01-26 00:51:36 +00:00
Jesse Duffield
89a09be6a0
Merge pull request #2262 from daramayis/uffizzi
2023-01-26 11:51:17 +11:00
Ryooooooga
069af50f50
chore(i18n): remove unused texts
2023-01-24 21:24:46 +09:00
Phanindra kumar Paladi
c6929c36ae
Corrected test assert
2023-01-23 15:53:21 +05:30
Phanindra kumar Paladi
e8f4508cba
Fixed integration test case
2023-01-23 15:48:43 +05:30
stk
b8d33b8f7b
Extract helper function doRewordEditor
...
No behavior change, just a preparation for the next commit.
2023-01-22 15:59:32 +01:00
Phanindra kumar Paladi
946b8b5670
Fixed the lable in the custom_patch_options_panel.go
2023-01-18 21:13:31 +05:30
