IntelliJ IDEA Pro Tips: Using Git Interactive Rebase

Git interactive rebase allows you to change individual commits, squash commits together, drop commits or change the order of the commits. This allows you to clean up your git commit history to make it linear and meaningful, which can make it easier to understand the history of the project in the future. Let's take a look at how this works.

*Author: Marit van Dijk

Join us:

#java #intelliJIDEA #intelliJ #jetbrains #programming #getting_to_know_intellij

[ChrisB_Crisps]

I love the accent of this dev advocate and that there intonation but the highs and lows and not very extreme and appropriate to the type of content (technical recorded demo video), very easy to understand for me as a non-british-english speakers. Great work

[GakisStylianos]

Wow this is so useful. Can't believe it's taken me so many years without realizing this exists 🤯

[allanjuan]

Can't get more clear than that. Great video

[petroniobonavides]

Sugesttion: Increase the font size, in IDE, when make the videos

[exsesx]

Very powerful feature, thanks for the highlight 👍🏻

[petroniobonavides]

Suggestion: do a complete playlist focused in Intellij substituting the gir command lines....for example: this video will substitute "git rebase -i Head~2"(2 is a example).. the idea is showing how Intellij can do a gitCli jobs.

[felipegutierrez]

very useful stuff. I used to do everything from command line and in the end I have to do "git push --force-with-lease".
I've noticed that when I do from IntelliJ I still needed to execute "git push --force-with-lease" from the terminal in the end.
Is there by any chance that this was forgotten in the video or is there an option to check IntelliJ that does it after I click in "start rebase"?

[Pictor]

Nice and simple interface.

It's worth mentioning that the GIT HISTORY SHOULD NEVER BE REWRITTEN (IF ONE DOESN'T KNOW WHAT THEY ARE DOING).
Rebasing interactively when on a shared/remote branch will create a lot of problems to you and your colleagues.

[ChronoWrinkle]

Would be good to also explain how push works in this scenario. it seems that im able to push such changes only using force push, it is so unobvious tbh

[exsesx]

I have a specific case that has occurred quite in a while. It is changing the commit message or author without changing the commit date. Can this feature do that?

[petroniobonavides]

Question: Why this Intellij "Git Rebase" does not work after Git push???

[krzysztofbarczynski]

It's easy to manipulate commits if there are no conflicts... Having conflicted files would be much more beneficial.

[p.j.meisch]

Please re-record this in a quality where the text in the dialogs can be read.

[Almighty_Flat_Earth]

Still we don't get the collapsible tree view feature while comparing two folders, it's a shame this basic feature is missing from a paid software. For many years, many requests have been active in YouTrack, but not implemented in jetbrains products. A free program called Meld has this feature. Unbelievable. You people don't know how to implement this feature? Or you don't want us to use it.

[michaels.]

You probably omitted the "edit" option because that's a topic worth an own video.

[AmxCsifier]

When you think you know all the JetBrains features...