1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-10 04:07:18 +02:00
lazygit/pkg/commands/git_commands
Stefan Haller 910a61dc46 Make "merged" take precedence over "unpushed"
Previously, when rebasing a branch onto a newer master, all commits from the
previous fork point up to its head were marked red (unpushed), including the
commits that are on master already. While this is technically correct from the
perspective of the current branch's upstream, it's not what most people expect,
intuitively; they want to see where the current branch starts, relative to
master. So all commits of master should be green, and then the commits of the
current branch in red.
2023-05-12 22:56:58 +02:00
..
bisect_info.go simplify 2022-03-24 20:14:41 +11:00
bisect.go select current bisect commit even if bisect was started on another branch 2022-01-26 19:29:17 +11:00
branch_loader_test.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
branch_loader.go fix: fix ambiguous branch name 2022-11-14 19:05:07 +11:00
branch_test.go fix: fix RefName of detached HEAD to works in Chinese 2023-01-27 20:45:18 +09:00
branch.go fix: fix RefName of detached HEAD to works in Chinese 2023-01-27 20:45:18 +09:00
commit_file_loader_test.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
commit_file_loader.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
commit_loader_test.go Store commit.Action as an enum instead of a string 2023-04-15 08:36:03 +02:00
commit_loader.go Make "merged" take precedence over "unpushed" 2023-05-12 22:56:58 +02:00
commit_test.go Split commit message panel into commit summary and commit description panel 2023-04-30 12:17:34 +10:00
commit.go Split commit message panel into commit summary and commit description panel 2023-04-30 12:17:34 +10:00
common.go feat: add GitVersion struct 2022-12-30 20:01:14 +09:00
config.go restore field 2022-01-09 14:09:53 +11:00
custom.go refactor to group up more commonly used git command stuff 2022-01-18 22:01:09 +11:00
deps_test.go Put gitCommon.version back in deps_test.go 2023-04-29 07:28:33 +02:00
file_loader_test.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
file_loader.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
file_test.go Implement edit presets 2023-04-13 13:14:00 +02:00
file.go Add support for falling back to legacy edit config 2023-04-13 13:14:00 +02:00
flow.go refactor to group up more commonly used git command stuff 2022-01-18 22:01:09 +11:00
patch.go Refactor to tighten interface to lazygit daemon 2023-04-29 07:28:33 +02:00
rebase_test.go chore(git_commands): support old git version (git rebase --empty=keep) 2023-05-02 16:27:32 +02:00
rebase.go chore(git_commands): support old git version (git rebase --empty=keep) 2023-05-02 16:27:32 +02:00
reflog_commit_loader_test.go Store commit.Status as an enum instead of a string 2023-04-15 08:36:03 +02:00
reflog_commit_loader.go Store commit.Status as an enum instead of a string 2023-04-15 08:36:03 +02:00
remote_loader.go (#2288) quote remoteName before compiling regex 2022-11-24 12:56:28 +00:00
remote.go start moving commit panel handlers into controller 2022-03-17 19:13:40 +11:00
stash_loader_test.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
stash_loader.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
stash_test.go chore: refactor rename stash 2022-10-16 09:30:04 +09:00
stash.go Merge pull request #1980 from ajhynes7/stash-untracked-changes 2022-11-14 18:46:53 +11:00
status.go Apply refactoring suggestions 2022-08-15 13:59:34 +01:00
submodule.go add a file close that was missed 2022-01-26 14:50:47 +11:00
sync_test.go Revert "feat: support for push --force-if-includes" 2023-04-17 19:37:33 +09:00
sync.go Revert "feat: support for push --force-if-includes" 2023-04-17 19:37:33 +09:00
tag_loader_test.go show tag message 2023-02-20 19:01:08 +11:00
tag_loader.go show tag message 2023-02-20 19:01:08 +11:00
tag.go Change push tag command 2023-04-16 10:37:11 +05:30
version_test.go feat: add GitVersion struct 2022-12-30 20:01:14 +09:00
version.go Add GitVersion field to NewIntegrationTestArgs 2023-04-15 08:36:03 +02:00
working_tree_test.go Allow ignoring whitespace in diff in commits panel 2023-02-07 12:14:29 +01:00
working_tree.go Allow ignoring whitespace in diff in commits panel 2023-02-07 12:14:29 +01:00