Version control improvements in Rider 2018.1
Sharing code is one of the most essential things in our daily developer’s life. Thanks to the IntelliJ front end, Rider always had very strong integration with various VCS providers. Examples are a fast log view with flexible search options as well as a unified/side-by-side diff view with live syntax and inspection highlighting. Many other neat features can added from our plugin repository.
In this post, we will look at partial git commits, additional grouping options and more version control improvements in Rider 2018.1.
Partial git commits
Everyone knows that small commits make it easier to review and track changes, or roll them back if something went wrong. With Rider 2018.1, partial commits (
git add -p) let us easily commit only selected changes, so-called chunks, from a file. We can use checkboxes in the diff view of the Commit Changes dialog to select chunks of code that we want to commit (Side-by-side view only):
Changelists are a great way to prepare a set of independent commits, where we can easily organize changes and draft commit message. We can always chose to create a new changelist, or use an existing one. The same functionality is available in the left-side gutter:
Moving lines to another changelist also works inside the Commit Changes dialog.
There’s now a new Group by option available in the Local Changes tab and Commit Changes dialog, which allows us to group changes by their directory or repository. This option also supports multiple selections:
Note that grouping by repository only appears when maintaining additional submodules and they have been added to the VCS roots as well.
Rider now also highlights hashes in the commit details, and allows us to one-click jump to this commit in the Log tab. This is particularly useful when inspecting cherry-pick and revert commits:
Finally, Abort Rebase, Continue Rebase, and Skip Commit are not available as additional actions in the Git Branches pop-up (Ctrl+Alt+Q):
Also, when using interactive rebase and choosing Edit for a certain commit, you can now easily make additional changes. We can just take our time, and confirm when done by clicking Continue in the sticky balloon notification:
We hope you’ll enjoy our enhancements in VCS integration.
Download Rider 2018.1 now! We’d love to hear your feedback!
Subscribe to Blog updates
Thanks, we've got you!
Another Look into the Future with Rider’s Predictive Debugger
In the 2023.2 release cycle, we’ve introduced the Predictive Debugger in ReSharper, which gives you predictions about code paths and variables beyond the current execution pointer. We’ve written extensively about its advantages compared to alternative debugging strategies like thorough thinking, log…
Visualize Entity Framework Relationships and Additional Query Analysis in ReSharper 2023.3
A lot of teams are using Entity Framework or EF Core to work with their database. As an Object-Relational Mapper (ORM), it bridges objects in code to a relational database model, so that as a developer you don’t have to worry too much about the actual database. We all know: that’s not entirely tr…
Automatically Analyze ASP.NET Core Performance With Dynamic Program Analysis
Slow web pages may make your users or customers abandon your web application, even before they’ve had a proper look at it. You’ve likely also been frustrated working with a web application that is slow to load. The good news is that the latest versions of ReSharper and JetBrains Rider’s Dynamic P…
OSS Power-Ups: MassTransit – Webinar Recording
The recording of our webinar, OSS Power-Ups: MassTransit, with Chris Patterson, is available. This was the thirteenth episode of our OSS Power-Ups series, where we put a spotlight on open-source .NET projects. Subscribe to our community newsletter to receive notifications about future webinars.…