Git & Intellij, How do I commit only parts of a changed file

Question

I can't seem to commit only a fraction of the changes in a file, it seems to be all of the file or nothing, I'm using Git with Intellij, is it possible?

Thanks.

As pointed out by @mach, this is a duplicate of https://stackoverflow.com/questions/21263784/how-to-commit-a-partial-file-hunks-to-git-in-pycharm — Charles Merriam, Dec 22 '17 at 23:51

Sean Lynch · Answer 1 · 2018-02-23T01:19:32.220

48

Update - 2/2018: The first EAP build for 2018.1 has landed and it's HERE! It is implemented as checkboxes for each hunk, so you can selectively check on them before making the commit. Enjoy!

Update - 12/2017:

Well 2017.3 was just released and this didn't make it in. So let's hope for 2018.1.

Update - 11/2017:

This has been 'in progress' for months now. The 2017.3 EAP releases have been coming out for a while but this issue hasn't been finished yet. With no updates to the issue other than people asking when it will be done, I'm thinking this will slip to the 2018 release.

Update - 2017:

This issue has been open for years as noted in some of the comments. But it is now in progress and sheduled to land in 2017.3 which is currently in EAP release and should be available this fall. So now, four years after this was asked, you will soon be able to actually do it right in the IDE.

edited Feb 23 '18 at 01:19

answered Oct 04 '17 at 01:33

Sean Lynch

2,852
4
32
46

so now we just have to wait for it to become true and then for all the great IntelliJ apps to rebase to 2017.3 core :) Can't wait! – Krystian Oct 21 '17 at 09:54
I wanted to come here and add a comment about 2018.1 but you beat me to it :) Anyway, finally `git add -p` in IDEA has come! – Minh Thai Apr 03 '18 at 09:32
would be nice to somehow never commit `debugger` lines in js – Keegan 82 Apr 10 '18 at 12:41
@Sean yes but we cannot edit an hunk and then commit it. I think we can only either accept or reject a hunk ? So, git add -p will still be needed as such – Number945 Apr 20 '18 at 10:44
1

Is there a way to remember lines which I selected? It could be a very nice feature – Eduard Grinchenko May 03 '18 at 12:57

score 32 · Accepted Answer · answered Jan 06 '13 at 22:02

32

Not in the IDE. As noted in comments, you can use the command line, but I find it much easier to use a GUI GIT client (I use Tower, but there are many available).

answered Jan 06 '13 at 22:02

khagler

3,996
29
40

28

That's a real shame. It's a prominent use case in my git workflow. For now, I use "git add --patch". – starmonkey Sep 13 '13 at 00:56
2

For reference, after using `git add --patch` and selecting the hunks you want, you run `git commit -m XXX` to actually commit it. – rogerdpack Apr 25 '16 at 19:17
1

As of 2018, Tower is available in full release for Windows. – David Gay Jan 24 '18 at 15:14

Andres Canella · Answer 3 · 2016-02-05T12:35:34.697

9

You should try SourceTree(Mac & Windows), It's free and a great tool for working with GIT. It has all the commit freedom you want in a confortable UI.

This is my commit workflow for IntelliJ, from simple to complex task:

IntelliJ
SourceTree
shell GIT.

edited Feb 05 '16 at 12:35

answered Dec 09 '15 at 15:42

Andres Canella

3,706
1
35
47

score 5 · Answer 4 · answered Feb 22 '18 at 10:21

5

The wait is finally over, partial commits are part of EAP 18.1: https://blog.jetbrains.com/idea/2018/02/intellij-idea-2018-1-eap-partial-git-commits-and-more/

answered Feb 22 '18 at 10:21

David Leitner

3,312
1
18
27

Git & Intellij, How do I commit only parts of a changed file

4 Answers4

Linked