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
469938ee9b
Merge pull request #2342 from knutwalker/override-git-sequence-editor-for-rebase
2023-02-05 13:52:35 +11:00
f7af2b991d
Updated README.md
2023-02-04 23:30:57 +00:00
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
7bd0c779c7
fix: fix default color to be white
2023-02-03 23:36:59 +09:00
16802a048e
Updated README.md
2023-02-01 10:52:32 +00:00
c0e805718d
Merge pull request #2358 from phanithinks/#2319_default_screen_mode
2023-02-01 21:52:09 +11:00
35c5f940a4
Fixing indent in user_config.go
2023-02-01 09:50:37 +05:30
77093451d4
Updated README.md
2023-01-31 06:03:06 +00:00
368d6437b8
Merge pull request #2373 from phanithinks/clipboard_patch_option_2357
2023-01-31 17:02:46 +11:00
01f0efb997
Merge branch 'master' into #2319_default_screen_mode
2023-01-29 10:25:14 +05:30
d0851113d1
Skipping copy_patch_to_clipboard test case
2023-01-29 10:20:56 +05:30
df58c75ca4
Fixed breaking integrtion tests(old)
2023-01-29 10:03:59 +05:30
d8c7d47067
Merge pull request #2395 from stefanhaller/trailing-lf-when-copying-diff-lines
2023-01-29 14:19:29 +11:00
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
996a1e469f
Merge pull request #2401 from Ryooooooga/disable-log-order
2023-01-29 14:05:31 +11:00
9d5d61260a
Updated README.md
2023-01-29 02:43:45 +00:00
18db5eafd4
Merge pull request #2384 from stefanhaller/disable-reword-in-editor-prompt
2023-01-29 13:43:23 +11:00
2183c157d4
feat(log): allow to disable git.log.order
2023-01-28 21:17:05 +09:00
5dec080719
fix: fix RefName of detached HEAD to works in Chinese
2023-01-27 20:45:18 +09:00
fc38e3b54d
Don't omit final line feed when copying diff lines to clipboard
2023-01-26 10:30:05 +01:00
93d845cb01
Cleanup: remove unused function RenderPlain
2023-01-26 10:30:05 +01:00
67fb28e2b8
Add user config gui.skipRewordInEditorWarning
2023-01-26 09:01:22 +01:00
679b0456f3
Merge pull request #2388 from Ryooooooga/remove-unused-texts
2023-01-26 13:46:01 +11:00
f7f24dbfc1
better test
2023-01-26 13:25:56 +11:00
b942df02a1
Merge pull request #2376 from Ryooooooga/fix-resolve-placeholder
2023-01-26 13:03:19 +11:00
f12a2edefa
Merge pull request #2372 from Ryooooooga/fix-installation-ubuntu
2023-01-26 12:58:49 +11:00
7e54b5641f
Updated README.md
2023-01-26 00:51:36 +00:00
89a09be6a0
Merge pull request #2262 from daramayis/uffizzi
2023-01-26 11:51:17 +11:00
069af50f50
chore(i18n): remove unused texts
2023-01-24 21:24:46 +09:00
c6929c36ae
Corrected test assert
2023-01-23 15:53:21 +05:30
e8f4508cba
Fixed integration test case
2023-01-23 15:48:43 +05:30
b8d33b8f7b
Extract helper function doRewordEditor
...
No behavior change, just a preparation for the next commit.
2023-01-22 15:59:32 +01:00
946b8b5670
Fixed the lable in the custom_patch_options_panel.go
2023-01-18 21:13:31 +05:30
d479a41cad
Added Integration testing the copy to clipboard in patchbuilding
2023-01-18 21:05:40 +05:30
7149cfeb11
fix: fix ReplacePlaceholderString
2023-01-18 20:56:22 +09:00
265cdde7bc
Fixed typo
2023-01-18 10:14:48 +05:30
e87fc4a229
Change key of clipboard copy
2023-01-18 05:50:47 +05:30
b45c5d8491
docs(README.md): fix installation scripts for Ubuntu
2023-01-17 16:42:51 +09:00
f6f82091bc
Added copy to clipboard option to the patch options
2023-01-17 09:07:07 +05:30
48df9b7f4e
Updated README.md
2023-01-16 22:19:40 +00:00
fd86d29400
Merge pull request #2343 from Ryooooooga/commit-verbose
2023-01-17 09:19:22 +11:00
a11e91e651
replaced 'screenMode' to 'windowSize' in config
2023-01-16 20:07:21 +05:30
6127e487dd
Updated README.md
2023-01-16 08:10:18 +00:00
1d89a5daa1
Merge pull request #2356 from Ryooooooga/missing-config-docs
2023-01-16 19:09:56 +11:00
f4ccb68464
Added screenMode configuration to gui configuration
2023-01-11 16:51:46 +05:30
b90af5461a
feat: uffizzi integration
2023-01-10 19:29:45 +04:00
acbcf9933d
docs(Config.md): add missing keybindings
2023-01-10 20:43:23 +09:00
21f8857d36
refactor: simplify log format
2023-01-06 11:15:33 +09:00
965f7bfcb2
feat(config): change git.commit.verbose to accept "default"
2023-01-06 11:15:33 +09:00
