| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2023-04-18 | Don't allow resetting non-HEAD commits (including rebase todos) during rebase | Stefan Haller | |
| 2023-04-15 | Don't allow changing the type of certain rebase todos | Stefan Haller | |
| We already show "merge" todo entries when starting an interactive rebase with --rebase-merges outside of lazygit. Changing the type of a merge entry to "pick" or "edit" doesn't make sense and shouldn't be allowed. Earlier in this branch we have started to show "update-ref" entries, these can't be changed either (they can be moved, though). You might argue that it should be possible to change them to "drop", but in the case of "update-ref" this doesn't make sense either, because "drop" needs a Sha and we don't have one here. Also, you would then be able to later change it back to "pick", so we would have to remember that this isn't allowed for this particular drop entry; that's messy, so just disallow all editing. | |||
| 2023-04-15 | Make moving todo commits more robust | Stefan Haller | |
| 2023-04-15 | Make EditRebaseTodo more robust | Stefan Haller | |
| It used to work on the assumption that rebasing commits in lazygit's model correspond one-to-one to lines in the git-rebase-todo file, which isn't necessarily true (e.g. when users use "git rebase --edit-todo" at the custom command prompt and add a "break" between lines). | |||
| 2023-04-15 | Store commit.Action as an enum instead of a string | Stefan Haller | |
| The main reason for doing this (besides the reasons given for Status in the previous commit) is that it allows us to easily convert from TodoCommand to Action and back. This will be needed later in the branch. Fortunately, TodoCommand is one-based, so this allows us to add an ActionNone constant with the value 0. | |||
| 2023-04-01 | Better error message when trying to amend a commit other than head during rebase | Stefan Haller | |
| 2023-04-01 | Allow amending the head commit during interactive rebase | Luka Markušić | |
| 2023-04-01 | Better error message when trying to edit or move a non-todo commit during rebase | Stefan Haller | |
| Previously we would have tried to do the rebase, resulting in a long and somewhat cryptic error message from git; now we check ourselves and show a less intimidating message. | |||
| 2023-04-01 | Allow rewording the head commit during interactive rebase | Stefan Haller | |
| 2023-04-01 | Cleanup: use commit.isTODO() consistently | Stefan Haller | |
| It seems cleaner than checking the Status for "rebasing". | |||
| 2023-02-22 | migrate interactive rebase integration tests | Jesse Duffield | |
| 2023-02-20 | Merge pull request #2453 from stefanhaller/allow-rebasing-to-first-commit | Jesse Duffield | |
| 2023-02-20 | add create tag from commit test | Jesse Duffield | |
| 2023-02-20 | Allow squashing fixups above the first commit of a repo | Stefan Haller | |
| This includes amending changes into a given commit, since that's implemented in terms of the former. | |||
| 2023-02-20 | Better error message for trying to squash or fixup the first commit | Stefan Haller | |
| It's not so much the total number of commits that matters here, it's just whether we are on the first one. (This includes the other condition.) This allows us to get rid of the condition in rebase.go. | |||
| 2023-02-19 | Edit by breaking after current commit | Stefan Haller | |
| Instead of rebasing from the commit below the current one and then setting the current one to "edit", we rebase from the current one and insert a "break" after it. In most cases the behavior is exactly the same as before, except that the new method also works if the current commit is a merge commit. This is useful if you want to create a new commit at the very beginning of your branch (by editing the last commit before your branch). | |||
| 2023-01-26 | Add user config gui.skipRewordInEditorWarning | stk | |
| 2023-01-22 | Extract helper function doRewordEditor | stk | |
| No behavior change, just a preparation for the next commit. | |||
| 2022-07-30 | Fix rewording a merge commit with editor | Luka Markušić | |
| 2022-06-09 | support setting the author of a commit | Jesse Duffield | |
| update copy | |||
| 2022-05-08 | rename displayString to label for menu items | Jesse Duffield | |
| 2022-05-08 | Add command to reset the commit author from the commits panel. | Jens Pfeifle | |
| 2022-03-30 | pkg/gui: Rename IPopupHandler::Ask() to Confirm() | Moritz Haase | |
| Follow the JavaScript naming scheme for user interaction (alert, prompt, confirm) as discussed in #1832. | |||
| 2022-03-27 | allow amending and reverting commits when filtering by file | Jesse Duffield | |
| 2022-03-26 | show namesake for child views | Jesse Duffield | |
| 2022-03-26 | add basic commits controller for handling actions that apply to all commit ↵ | Jesse Duffield | |
| contexts | |||
| 2022-03-26 | Add copy commit attributes option | Luka Markušić | |
| 2022-03-23 | safe reword | Jesse Duffield | |
| 2022-03-19 | use generics to DRY up context code | Jesse Duffield | |
| 2022-03-17 | fix click handling | Jesse Duffield | |
| 2022-03-17 | fix integration tests | Jesse Duffield | |
| 2022-03-17 | rename handlers | Jesse Duffield | |
| 2022-03-17 | add commit files controller | Jesse Duffield | |
| 2022-03-17 | add common commit controller | Jesse Duffield | |
| 2022-03-17 | cleanup | Jesse Duffield | |
| 2022-03-17 | more consistent naming | Jesse Duffield | |
| 2022-03-17 | refactor controllers | Jesse Duffield | |
| 2022-03-17 | controller for viewing sub commits | Jesse Duffield | |
| 2022-03-17 | refactor contexts | Jesse Duffield | |
| 2022-03-17 | more refactoring | Jesse Duffield | |
| 2022-03-17 | refactor keybindings | Jesse Duffield | |
| 2022-03-17 | no more indirection | Jesse Duffield | |
| 2022-03-17 | resetting controllers on new repo | Jesse Duffield | |
| 2022-03-17 | some more refactoring | Jesse Duffield | |
| 2022-03-17 | move commit files context into new structure | Jesse Duffield | |
| 2022-03-17 | standardise naming | Jesse Duffield | |
| 2022-03-17 | add actions abstraction | Jesse Duffield | |
| 2022-03-17 | refactor contexts code | Jesse Duffield | |
| 2022-03-17 | fix some things | Jesse Duffield | |
| 2022-03-17 | start moving commit panel handlers into controller | Jesse Duffield | |
| more and more move rebase commit refreshing into existing abstraction and more and more WIP and more handling clicks properly fix merge conflicts update cheatsheet lots more preparation to start moving things into controllers WIP better typing expand on remotes controller moving more code into controllers | |||
 |
index : lazygit | |
| Mirror of https://github.com/jesseduffield/lazygit | matthias |
| summaryrefslogtreecommitdiffstats |