Stefan Haller
979c3d6278
Fix yellow/red coloring of pushed/unpushed commits in branch commits panel ( #2448 )
2023-02-19 10:13:46 +11: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
5bb6198219
Allow ignoring whitespace in diff in commits panel
2023-02-07 12:14:29 +01:00
stk
946c1dff99
Cleanup: remove extra space
2023-02-07 12:09:15 +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
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
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
Ryooooooga
21f8857d36
refactor: simplify log format
2023-01-06 11:15:33 +09:00
Ryooooooga
965f7bfcb2
feat(config): change git.commit.verbose to accept "default"
2023-01-06 11:15:33 +09:00
Paul Horn
bc7873144e
Override GIT_SEQUENCE_EDITOR for rebase commands
...
I noticed that `$GIT_SEQUENCE_EDITOR` is overridden in `PrepareInteractiveRebaseCommand`
but not in `runSkipEditorCommand`.
Before this change, some commands such as `SquashAllAboveFixupCommits`
would not work when a different sequence editor, e.g.
[git-interactive-rebase-tool](https://github.com/MitMaro/git-interactive-rebase-tool )
is configured.
2023-01-01 04:37:19 +01:00
Jesse Duffield
1bb138c79c
Merge pull request #2341 from knutwalker/commit-verbose
2023-01-01 13:57:49 +11:00
Paul Horn
d98130c3ef
Add option to allow --verbose commit in editor commits
2023-01-01 02:01:04 +01:00
Ryooooooga
7c5f33980f
fix: improve backward compatibility
2022-12-31 22:47:21 +09:00
Ryooooooga
e00f248cf7
feat: support for push --force-if-includes
2022-12-30 20:01:15 +09:00
Ryooooooga
cd9111837e
feat: add GitVersion struct
2022-12-30 20:01:14 +09:00
Nils Andresen
245563bc99
( #2288 ) quote remoteName before compiling regex
...
If the remote name contains special regex-chars,
the compilation of the regex might fail.
Quoting the remoteName ensures that all special chars
in the remoteName are properly escaped before compiling
the regex.
2022-11-24 12:56:28 +00:00
Ryooooooga
52a2e4c1dc
fix: fix ambiguous branch name
...
test: add an integration test for checkout branch by name
fix: fix full ref name of detached head
refactor: refactor current branch loader
chore: use field name explicitly
2022-11-14 19:05:07 +11:00
Jesse Duffield
b33ec5a050
Merge pull request #1980 from ajhynes7/stash-untracked-changes
2022-11-14 18:46:53 +11:00
sudoburt
3e73dacce3
Merge loaders package into git_commands package
2022-11-14 18:11:45 +11:00
Jesse Duffield
df3cd941d7
use tempdir in tests to prevent polluting worktree
2022-11-13 14:10:21 +11:00
Jesse Duffield
97ced9e14f
fix could-not-access error
2022-11-12 18:09:15 -03:30
Jesse Duffield
e8b97c9fe2
fix could-not-access error
2022-11-11 12:30:14 +11:00
Andrew Hynes
a47e72892a
Merge branch 'master' into stash-untracked-changes
2022-11-01 16:08:34 -02:30
Ryooooooga
3103398e31
chore: refactor rename stash
2022-10-16 09:30:04 +09:00
Ryooooooga
eceb3a5aa6
chore: refactor rename stash
2022-10-16 09:12:43 +09:00
Ryoga
8a9eefa4d2
chore: remove unnecessary space
...
Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>
2022-10-16 09:12:43 +09:00
Ryooooooga
11316b7a48
feat: add rename stash
2022-10-16 09:12:42 +09:00
Andrew Hynes
8c46a0110d
Merge branch 'master' into stash-untracked-changes
2022-10-06 22:59:06 -02:30
Luka Markušić
41f86f6535
Rebase merges by default
2022-09-24 23:37:17 +02:00
jiepeng
b8900baf1a
remove deprecated calls
2022-09-17 15:10:41 -07:00
Andrew Hynes
c7733aa5e5
refactor: rename method to StashIncludeUntrackedChanges
2022-09-15 21:48:49 -02:30
Andrew Hynes
6feb301c2a
fix: use message in git stash command
2022-09-15 21:48:49 -02:30
Andrew Hynes
e66b162726
refactor: remove redundant if statement
2022-09-15 21:48:49 -02:30
Andrew Hynes
4f8816ebf2
refactor: use extended flag name
2022-09-15 21:48:49 -02:30
Andrew Hynes
7ddb80a13e
feat: add stash option to include untracked changes
2022-09-15 21:48:48 -02:30
nullishamy
154bd975a6
Apply refactoring suggestions
2022-08-15 13:59:34 +01:00
Jesse Duffield
755ae0ef84
add deadlock mutex package
...
write to deadlock stderr after closing gocui
more deadlock checking
2022-08-07 11:16:14 +10:00
Jesse Duffield
524bf83a4a
refactor to only have one context per view
2022-08-06 13:49:11 +10:00
Jesse Duffield
86ac309e08
add build info when building from source
2022-08-01 20:16:50 +10:00
Juan Sanchez Montalvo
11d766053e
Allow adding a file to the .git/info/exclude file
2022-07-05 19:33:44 +10:00
Jesse Duffield
9591cc381a
support setting the author of a commit
...
update copy
2022-06-09 19:12:20 +10:00
Luka Markušić
ca191159f5
Discard staged changes only
2022-05-08 14:24:28 +02:00
Jens Pfeifle
fbe23b3754
fixup! Add command to reset the commit author from the commits panel.
2022-05-08 13:29:57 +10:00
Jens Pfeifle
7ac487545c
fixup! Add command to reset the commit author from the commits panel.
2022-05-08 13:29:56 +10:00
Jens Pfeifle
7c573a5bea
Add command to reset the commit author from the commits panel.
2022-05-08 13:29:56 +10:00
Ryooooooga
5717e72366
fix: fix copying author name to clipboard
2022-05-07 18:08:05 +09:00
Jesse Duffield
cd5b041b0f
clearer separation of concerns when bootstrapping application
2022-05-07 16:02:04 +10:00
Ryooooooga
d458e78d95
feat: add ability to edit hunk
2022-05-06 21:53:00 +09:00
Jesse Duffield
0940e0182b
Merge pull request #1870 from mark2185/feature/stash-unstaged
2022-05-06 20:17:33 +10:00
