summaryrefslogtreecommitdiffstats
path: root/pkg/commands
AgeCommit message (Collapse)Author
2019-11-05better rebase argsJesse Duffield
2019-11-05Support building and moving patchesJesse Duffield
WIP
2019-11-05support split view in staging panel and staging rangesJesse Duffield
2019-10-20Added light theme option to the settingsmjarkk
2019-07-27477 Remove unnecessary variable checkGiorgio Previtera
hasInlineMergeConflicts is always true with hasMergeConflicts is true
2019-07-27#477 Remove `NeedMerge` booleanGiorgio Previtera
Instead of storing the status in a new variable, derive it from the existing three fields
2019-07-27477 Add new `NeedReset` property to File and update testsGiorgio Previtera
Use a boolean to determin if a file needs to be reset. We want to reset the file when discrading changes if there is a conflict.
2019-07-27477 Remove duplicate checkoutGiorgio Previtera
We already checout the file calling `c.DiscardUnstagedFileChanges`
2019-07-27#477 Discard changes when there are merge conflictsGiorgio Previtera
If there are merge conflicts, reset the file and discard all changes
2019-07-27Simplified boolean comparisonChristian Muehlhaeuser
2019-07-27Simplified code a bitChristian Muehlhaeuser
2019-07-14fix typohaowei
2019-06-06add GIT_OPTIONAL_LOCKS=0 env var to all commandsJesse Duffield
2019-06-06allow stashing staged changesJesse Duffield
reinstate old stash functionality with the 's' keybinding
2019-05-12Support opening lazygit in a submodulev0.8Jesse Duffield
2019-05-06support resetting to a commit in either soft, hard, or mixed modeJesse Duffield
2019-05-06Improve directory check for .gitSuhas Karanth
Return error if the .git exists but is not a directory. This provides a slightly better failure message for git repo with submodules in case the '.git' is a file which provides the reference to the parent's .git folder with the submodule inside.
2019-04-13Add 'w' keybinding in files panel to commit as a WIPJesse Duffield
If your git.skipHookPrefix is set to, say, WIP, in your config, then hitting 'w' in the files panel will bring up the commit message panel with 'WIP' pre-filled, so you just need to hit enter to confirm (or add some more to the message) in order to commit your changes with the --no-verify flag, meaning the pre-commit hook will be skipped
2019-04-13Add skipHookPrefix to configJesse Duffield
allows a user to specify a commit message prefix that will tell lazygit to skip the pre-commit hook. This defaults to WIP. Setting it to the empty string will disable the feature. So if my message goes 'WIP: do the thing' then the pre-commit hook will not run
2019-04-10Change expected sha for DiscardOldFileChangesPeter Lundberg
2019-04-10Always include atleast 2 commits when doing squash and fixupPeter Lundberg
2019-04-07support custom commandsJesse Duffield
2019-04-07Allow for creating fixup! commitsJesse Duffield
2019-04-06fixed some #397skanehira
2019-04-06add feature of display diff between specific commits #397skanehira
2019-03-23move soft reset keybinding into reset optionsJesse Duffield
2019-03-23add more options for resetting files in the working treeJesse Duffield
2019-03-23support discarding unstaged changesJesse Duffield
2019-03-16Update bitbucket pull request url.Kristijan Husak
2019-03-16add two more testsJesse Duffield
2019-03-16fix testsJesse Duffield
2019-03-16display test name when running testsJesse Duffield
2019-03-16add some testsJesse Duffield
2019-03-16appease golangciJesse Duffield
2019-03-16i18n for error message about a feature being disabled for GPG usersJesse Duffield
2019-03-16allow user to discard old file changes for a given commitJesse Duffield
2019-03-16allow user to checkout old filesJesse Duffield
2019-03-16minor cleanupJesse Duffield
2019-03-16Add feature of display committed file list #383skanehira
2019-03-03distinguish between inline and non-inline merge conflictsJesse Duffield
2019-03-03acknowledge 'DU' statuses as being merge conflictsJesse Duffield
2019-03-03windows support for skipping the editorJesse Duffield
2019-03-02fix issue where you couldn't rearrange commits while rebasing onto a branchJesse Duffield
2019-03-02Revert "remove old rebase code now that we're only ever interactively rebasing"Jesse Duffield
This reverts commit 1a19b1412d3da03992403cf62fddf06031de2927.
2019-03-02appease golangciJesse Duffield
2019-03-02fix up testsJesse Duffield
This fixes up some git and oscommand tests, and pulls some tests into commit_list_builder_test.go I've also made the NewDummyBlah functions public so that I didn't need to duplicate them across packages I've also given OSCommand a SetCommand() method for setting the command on the struct I've also created a file utils.go in the test package for creating convient 'CommandSwapper's, which basically enable you to assert a sequence of commands on the command line, and swap each one out for a different one to actually be executed
2019-02-24cleanupJesse Duffield Duffield
2019-02-24change type of cherryPickedCommits from []string to []*CommitJesse Duffield Duffield
2019-02-24support cherry picking commitsJesse Duffield Duffield
2019-02-24remove old rebase code now that we're only ever interactively rebasingJesse Duffield Duffield
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 19:07:10 +0000