- Removed automatic rediscovery in case of empty machete file
- Fixed indication of a repeated entry in machete file.
-
Added support for IntelliJ 2022.3.
-
Fixed spurious
NullPointerExceptionthrown when opening machete file via toolbar, as reported by @oksana-cherniavskaia. -
Added branch navigation allowing to check out:
- previous branch with
alt + up-arrow, - next branch with
alt + down-arrow, - parent branch with
alt + left-arrow, - first child branch with
alt + right-arrowwhen Git Machete tab is opened, and has focus.
Note that
optionkey is the equivalent ofaltin macOS. - previous branch with
- Enabled Ctrl + left-click to work as a right-click for macOS users, for displaying the machete actions on a branch.
- Enabled context-menu Override Fork Point... action for branches that are out of sync (red-edge).
- Fixed missing Open Git Machete Tab in Git menu.
- Added a warning dialog window that pops up when
Sync To Parent By Mergeis about to be used.
- Dropped support for IntelliJ 2020.3, 2021.1, 2021.2 and 2021.3. Note that the versions of this plugin published so far will remain available for download in IntelliJ 2020.3-2021.3 indefinitely. The change in the range of supported IntelliJ versions will only affect the new plugin releases, starting from this one.
- Added autocomplete functionality to Slide In dialog as suggested by @KotlinIsland.
- Add an action to automatically squash the commits belonging to the given branch.
- Add support for IntelliJ 2022.2.
- Show a path to repository (from project root) instead of a repository name alone in the repository selection combobox.
- The Pull action displays custom notification message when it is executed on branch that no longer exists remotely.
- Fix docs on the shortcut that opens Git Machete Tab (command option shift M) on Mac.
- Merge Parent Into Current action has been added.The action merges a parent branch into the current branch, as suggested by @mkondratek and @pedroadame.
- Dropped support for IntelliJ 2020.1 and 2020.2.
- The Pull action on specific branch displays additional information whether fetch has been performed before fast-forward merge, as suggested by @micpiotrowski.
- Squash-merges are now detected (and marked with gray edge) as in git-machete CLI - first suggested by @asford.
- The reoccurring problem with AlreadyDisposedException (reported by @yeahbutstill) is now hopefully solved.
- The Pull action fetches all branches from the remote.Pulling a branch now behaves consistently with git pull by fetching all branches.
- Show in Git log action has been added to per-branch context menu options.The action points to a branch (its latest local commit) within IntelliJ's built-in Git log, as suggested by @KotlinIsland.
- The slide-out dialog displays name of the branch to be slid-out and potentially deleted (contributed by @DcortezMeleth).
- Change machete file location for worktrees to the top-level .git/machete (rather than .git/worktrees/.../machete), as reported by @jeffjensen.This location is now compatible with git-machete CLI.
- Provide separate code style settings for machete files.Opening machete file in editor no longer changes global code style settings for Other File Types, as reported by @radeusgd.
- Added support for IntelliJ 2022.1.
- Improved reporting of errors as GitHub issues (contributed by @DcortezMeleth).
- Added support for IntelliJ 2021.3.
- Disabled Fetch button when there are no remotes in the current repository.
- For one minute after a fetch, refrain from re-fetching the repo when doing a pull
- Fix newly created branches sometimes incorrectly recognized as merged to parent
- Added support for IntelliJ 2021.1
- Added dialog that suggests deleting local branches when sliding out
- Added support for git config core.hooksPath property
- Allowed slide out of currently checked out branch
- Slide Out action slides out all occurrences of branch entry
- Added slide out suggestion action link for the skipped branches to the skipped branches warning
- Dropped external system - hackish approach to provide machete-file-to-graph-table synchronization
- Added machete file changes listener - reasonable approach to provide machete-file-to-graph-table synchronization
- Add discover action to the toolbar
- Do not show double-listed branches in graph table
- Added tooltip for root branch as well as non-root branches
- Enhance messages related to the ill-formed branch layout
- Correctly check if Git Machete Tab is opened the project resolver (fixes premature discover)
- Improve branch layout discover/write/backup reliability
- Added support for IntelliJ 2021.1
- Added dialog that suggests deleting local branches when sliding out
- Added support for git config core.hooksPath property
- Allowed slide out of currently checked out branch
- Slide Out action slides out all occurrences of branch entry
- Added slide out suggestion action link for the skipped branches to the skipped branches warning
- Add discover action to the toolbar
- Do not show double-listed branches in graph table
- Added tooltip for root branch as well as non-root branches
- Correctly check if Git Machete Tab is opened the project resolver (fixes premature discover)
- Improve branch layout discover/write/backup reliability
- Add link to Open Machete File action from discovery success notification
- Improve stability of fast-forward pull action
- Prohibit re-checking out the currently checked out with double click
- Rename "fast-forward parent to match branch" action to "fast-forward merge branch to parent"
- Treat develop branch as root in discovery, even if master branch is present
- Added support for IntelliJ 2020.3.
- "Slide In Branch Below Current Branch" action is now hidden for unmanaged branches
- Fixed faulty .git/machete file parsing when the last line has only whitespace
- Improved UX of Override Fork Point dialog
- Allowed fast forwarding parent when a branch is connected to the parent with a yellow edge
- Fixed font size dependent graph scaling
- Fixed incorrect indication of newly created branch after pulling its parent as merged
- Allowed checkout and rebase on detached state
- Improved fork point inference
- Added rediscover suggestion after long Git Machete non-use time
- Added support for IntelliJ 2020.3.
- "Slide In Branch Below Current Branch" action is now hidden for unmanaged branches
- Fixed faulty .git/machete file parsing when the last line has only whitespace
- Improved UX of Override Fork Point dialog
- Allowed fast forwarding parent when a branch is connected to the parent with a yellow edge
- Sliding out root branches is now allowed
- Success notifications for reset to remote, fast-forward, rebase and slide out actions have been made clearer
- Machete file is automatically refreshed in the editor once the status is refreshed in the VCS tab
- Both 'develop' and 'main' can also be considered root branches in layout discovery if 'master' branch is absent
- Status is now always automatically refreshed after resetting current branch to remote
- Added 'Edit' option to the discovered dialog that opens machete file
- Enable branch name completion and syntax annotation while indexing
- Prohibit force push of protected branches
- Ensure each project-readiness-dependent action is disabled & hidden as long as project is not ready
- Unreliable links has been removed; non-existing/empty machete file is being created by autodiscover
- Added discover functionality
- Added fork point override functionality
- Branch reset is possible without checking it out
- Toolbar menu was revamped to suggest most suitable actions for the current branch
- Pull action uses inferred remote branch in case tracking config is missing
- Added tooltips with information about synchronization to parent branch status for given branch
- Sliding in a branch that does not exist in the local repository but has a remote counterpart was fixed
- Fast forwarding given branch to the currently checked out branch is possible
- Branch names of submodule repository are checked and proposed correctly in machete file editor
- Toggle listing commits is disabled in case there are no commits to display
- Added support for pulling current branch
- Added support for sliding in a new branch (or reattaching a existing one) without the need to edit machete file manually
- Open Machete Tab action was added under VCS/Git submenu with key shortcut Ctrl + Alt + Shift + M
- Current branch is marked even if there is an ongoing operation in repo (rebasing, bisecting, etc.) and name of this operation is displayed
- Added a notification when skipping branches declared in machete file but nonexistent in the repository
- Reset action is preceded by information dialog
- Reset is prohibited when uncommitted changes are present in repository
- Detecting existing indentation style in machete file editor
- Refreshing of branch tree after slide-out action
- Reset always gets up-to-date commit from remote tracking branch
- Fast-forward is possible without remote tracking branch information
- Added editor for .git/machete file with syntax highlighting
- Added action for fast-forwarding parent to the given branch
- Added action for resetting the given branch to its remote tracking branch
- Added fetch/pull actions
- Added help action
- Improved displaying of status
- Improved push action to automatically suggest force-push when needed
- Improved stability of push dialog (v0.5.1)
- Improved stability of slide out (v0.5.2)
- Improved stability of push dialog
- Added editor for .git/machete file with syntax highlighting
- Added action for fast-forwarding parent to the given branch
- Added action for resetting the given branch to its remote tracking branch
- Added fetch/pull actions
- Added help action
- Improved displaying of status
- Improved push action to automatically suggest force-push when needed