IntelliJ IDEA Pro Tips: Using Git Interactive Rebase

Рет қаралды 35,381

Күн бұрын

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.
For more information, go to: jb.gg/diu623
Top 15 IntelliJ IDEA shortcuts: • Top 15 IntelliJ IDEA s...
Download IntelliJ IDEA: jb.gg/download...
*Author: Marit van Dijk
Join us:
Website jb.gg/website
Blog jb.gg/blog
Twitter / intellijidea
Facebook / intellijidea
#java #intelliJIDEA #intelliJ #jetbrains #programming #getting_to_know_intellij

Пікірлер: 26

@ChrisB_Crisps 2 жыл бұрын

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 2 жыл бұрын

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

@petroniobonavides3530 2 жыл бұрын

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

@allanjuan1149 3 ай бұрын

Can't get more clear than that. Great video

@nmarulodev 2 жыл бұрын

Interesting, thanks for the tip.

@exsesx 2 жыл бұрын

Very powerful feature, thanks for the highlight 👍🏻

@DinHamburg 2 жыл бұрын

Useful stuff, indeed

@petroniobonavides3530 2 жыл бұрын

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.

@maritvandijk 2 жыл бұрын

Great idea! It's good to know both so you can use whichever you prefer. We added a tutorial that also includes how to do the same from the command line: www.jetbrains.com/idea/guide/tutorials/git-interactive-rebase/

@petroniobonavides3530 2 жыл бұрын

@@maritvandijk yep... But, it's good to highlight that.. although the Intellij is able to provide a Intellij-UI for git-cli-commands, if the user "do not know" the command beforehand in git-cli, the user will not understand properly the concept vidual-done by Intellij. However, let's be frankly do squashes,rewords,drop,..etc... Using git rebase -i HEAD~N is a boring and actually is a PInTheA..

@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

@felipegutierrez7856 2 жыл бұрын

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"?

@RicardoDirani Жыл бұрын

Impressive

@krzysztofbarczynski6736 2 жыл бұрын

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

@maritvandijk Жыл бұрын

We just released a video on Resolving Merge Conflicts in Git. You can find it here: kzfaq.info/get/bejne/jc2Zo7qcxruWfYE.html

@exsesx 2 жыл бұрын

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?

@Almighty_Flat_Earth 2 жыл бұрын

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.7562 2 жыл бұрын

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

@maritvandijk 2 жыл бұрын

Yes, there is much more we could talk about. There is a little bit on how to edit or reword the commit message in the tutorial: www.jetbrains.com/idea/guide/tutorials/git-interactive-rebase/

@p.j.meisch701 Жыл бұрын

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

@petroniobonavides3530 2 жыл бұрын

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

@RutgerOlthuis 2 жыл бұрын

Because push puts the changes on the git server. So other developers might already have pulled those changes to their local repository and they might already have done their own changes based on the history you pushed to the central repo.