**Update - 2/2018:**
The first EAP build for 2018.1 has landed and it&#39;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&#39;t make it in. So let&#39;s hope for 2018.1.

**Update - 11/2017:**

This has been &#39;in progress&#39; for months now. The 2017.3 EAP releases have been coming out for a while but this issue hasn&#39;t been finished yet. With no updates to the issue other than people asking when it will be done, I&#39;m thinking this will slip to the 2018 release.

**Update - 2017:**

This [issue][1] 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.

  [1]: https://youtrack.jetbrains.com/issue/IDEA-63201

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][1], but there are many available).


  [1]: http://www.git-tower.com/

You should try SourceTree(Mac &amp; Windows), It&#39;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:

1. IntelliJ
2. SourceTree
3. shell GIT.

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/

I want to:
Export table from sql server database to a comma delimited `csv` file without using sql Server import export wizard

I want to do it using a query because I want to use the query in automation

Is it possible? I searched for that and didn&#39;t find a good answer

Export table from database to csv file

Okay so I&#39;m kind of stumped on what to do with this. So I have the MainActivity, and from there an Activity can be launched to DegreePlanActivity, and from there another Activity can be launched to EditDegreePlan. I&#39;ve got EditDegreePlan set to noHistory in the AndroidManifest. The problem is after they save the EditDegreePlan it launches an Activity to DegreePlan. So if the user presses Back they have to press it twice to get to MainActivity again. I want to get rid of that so they only have to press it once. I&#39;m stumped on how to do this though.

If I set DegreePlanActivity to noHistory then they couldn&#39;t press Back to it while in EditDegreePlan.

I&#39;ve tried overriding onBackPressed method and launching an intent to MainActivity. The problem then is that they have to press Back multiple times to exit the app then.

What should I do?

Android remove Activity from back stack

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

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

<p>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?</p>
<p>Thanks.</p>


Git windows command line, version 1.8.0

I have 3 commits so far and when I type

    git reset --soft HEAD^

new line comes up with

    More?

and flashing cursor for input

Then, whatever I type, I always get 


&gt;fatal: ambiguous argument &#39;HEAD
&#39;: unknown revision or path not in the working tree.
Use &#39;--&#39; to separate paths from revisions, like this:
&#39;git &lt;command&gt; [&lt;revision&gt;...] -- [&lt;file&gt;...]

All other commands works fine in the same folder.

git reset asks &#39;more?&#39;

Is it able to show changed **file name** only with `git log`?


How to show changed file name only with &#39;git log&#39;

I am trying to clone a Git repo using a custom SSH command. I set the SSH command in the GIT_SSH environmental variably be running 

`export GIT_SSH=&quot;/usr/bin/ssh -o StrictHostKeyChecking=no -i /home/me/my_private_key&quot;`. 

But when, after the previous command I run 

`git clone git@bitbucket.org:uname/test-git-repo.git`, I get the following weird error

    error: cannot run /usr/bin/ssh -o StrictHostKeyChecking=no -i /home/me/my_private_key
    fatal: unable to fork

Can you please help me out solve this issue?

Git clone with custom SSH using GIT_SSH error

How can I configure `git log` to show `commit date` instead of `author date`?


How to configure &#39;git log&#39; to show &#39;commit date&#39;

&gt; **Possible Duplicate:**  
&gt; [When would you use the different git merge strategies?](https://stackoverflow.com/questions/366860/when-would-you-use-the-different-git-merge-strategies)  

&lt;!-- End of automatically inserted text --&gt;

When git merges files I&#39;m working on, I see:

    Merge made by the &#39;recursive&#39; strategy

What exactly is the recursive strategy? What other strategies are there (if any)? And what would be the benefit of using one over the other? Do different strategies have different performances? Or could two different strategies result in different merge results?

What are git&#39;s merge strategies?

I use Intellij IDEA 12 and I want to hide `.iml` files in Project view. How I can achieve this? 

Intellij IDEA. Hide .iml files

I have a Spring project for a small web app set up in Intellij IDEA.

It uses JPA on top of Hibernate for the persistence layer. The datasource (MySQL) is defined in Spring application context :

&lt;!-- language: xml --&gt;

        &lt;!-- Values are configured via the property override --&gt;
        &lt;bean id=&quot;myDataSource&quot; class=&quot;org.apache.commons.dbcp.BasicDataSource&quot; &gt;
            &lt;property name=&quot;driverClassName&quot; value=&quot;&quot;/&gt;
            &lt;property name=&quot;url&quot; value=&quot;&quot;/&gt;
            &lt;property name=&quot;username&quot; value=&quot;&quot;/&gt;
            &lt;property name=&quot;password&quot; value=&quot;&quot;/&gt;
        &lt;/bean&gt;

The actual value are read from a properties file and injected at runtime by Spring using the property-override mechanism.

And then the datasource is injected into the entity manager factory in the same application context:

&lt;!-- language: xml --&gt;

        &lt;bean id=&quot;entityManagerFactory&quot; class=&quot;org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean&quot;&gt;
            &lt;property name=&quot;dataSource&quot; ref=&quot;myDataSource&quot;/&gt;
        &lt;/bean&gt;

Finally the entity manager injected into the DAOs using an annotation:

    /**
     * Shared, thread-safe proxy for the actual transactional EntityManager
     */
    @PersistenceContext
    private EntityManager em;

It all works fine when I build and deploy it to Tomcat, but Intellij&#39;s JPA validation doesn&#39;t seem to understand where to get the datasource from. 

In my entities, the tables&#39; names and columns&#39; names are underlined in red and the validation message is &quot;cannot resolve table&quot; or &quot;cannot resolve column&quot;:

    @Entity
    @Table(name = &quot;domain&quot;)
    public class Domain extends AbstractAgendaEntity {

Int this example, it&#39;s the `&quot;domain&quot;` part that is not considered valid.

I have manually configured my database in the &quot;Database&quot; tool window, I can see my tables and perform SQL queries in the console.

How can I tell Intellij to use this datasource to resolve table names for my JPA entities?

Intellij IDEA: specify datasource for JPA validation

I am banging my head against the wall here trying to figure out why IntelliJ/Android is reporting  &quot;Empty test suite&quot;. I have a small project with two IntelliJ Modules (&quot;Projects&quot; in Eclipse). The Unit test module has its own AndroidManifest.xml, which I have pasted at the bottom. I am trying to run an `ActivityUnitTestCase`, since the tests will be dependent upon the `Context`-object.

The package name of the main module is `nilzor.myapp`. The pacakge name of the test module is `nilzor.myapp.tests`

Why is not the test runner detecting the `testBlah()`-method as a test?


	&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
	&lt;!-- package name must be unique so suffix with &quot;tests&quot; so package loader doesn&#39;t ignore us --&gt;
	&lt;manifest xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
			  package=&quot;nilzor.myapp.tests&quot;
			  android:versionCode=&quot;1&quot;
			  android:versionName=&quot;1.0&quot;&gt;
		&lt;!-- We add an application tag here just so that we can indicate that
			 this package needs to link against the android.test library,
			 which is needed when building test cases. --&gt;
		&lt;application&gt;
			&lt;uses-library android:name=&quot;android.test.runner&quot;/&gt;
		&lt;/application&gt;
		&lt;!--
		This declares that this application uses the instrumentation test runner targeting
		the package of nilzor.myapp.  To run the tests use the command:
		&quot;adb shell am instrument -w nilzor.myapp.tests/android.test.InstrumentationTestRunner&quot;
		--&gt;
		&lt;instrumentation android:name=&quot;android.test.InstrumentationTestRunner&quot;
						 android:targetPackage=&quot;nilzor.myapp&quot;
						 android:label=&quot;Tests for nilzor.myapp&quot;/&gt;
	&lt;/manifest&gt;


And here is my test class:;

	package nilzor.myapp.tests;

	public class NilzorSomeTest&lt;T extends Activity&gt; extends ActivityUnitTestCase&lt;T&gt;{
		public NilzorSomeTest(Class&lt;T&gt; activityClass){
		    super(activityClass);
		}

		@SmallTest
		public void testBlah(){
		    assertEquals(1,1);
		}
	}


I have read the [testing fundamentals][1], the [activity testing document][2], and tried following this [Hello world test blog][3], even though it is for Eclipse. I cannot get the test runner to find and run my test. What am I doing wrong?

Some of the questions I still feel unsure about are:

 1. Do I need an Annotation above the Unit test method?
 2. Do I need to prefix the method with &quot;test&quot;, or is that just for JUnit tests?
 3. Can I have tests in sub-packages of `nilzor.myapp.tests`?

But the main question of this post is *why does not the test runner detect my test*?

  [1]: http://developer.android.com/tools/testing/testing_android.html
  [2]: http://developer.android.com/tools/testing/activity_testing.html
  [3]: http://wptrafficanalyzer.in/blog/android-testing-example-helloworld-with-activityunittestcase/

Why is the Android test runner reporting &quot;Empty test suite&quot;?

I&#39;m really liking the IntelliJ diff tool. I&#39;m wondering if it is possible to use this tool to diff two arbitrary files. I.e. files NOT in an IntelliJ project. Just pick two files in the file system and diff them?  What about if I want to diff two strings? In my text editor, I&#39;d just create two new documents, paste the text in and diff them, then not save the files when done. Is this possible?

Thanks

Using IntelliJ to diff two arbitrary files

Under `/usr/share/applications` I created:

`intellij.desktop`:

    #!/usr/bin/env xdg-open
    [Desktop Entry]
    Version=1.0
    Type=Application
    Terminal=false
    Exec=/path/To/idea.sh&quot;
    Name[en_US]=Intellij
    Name=Intellij
    Icon=/path/to/intellij.png

Then I drag it to the Unity launcher bar. I click it, but nothing happens. How can I make it work?

`JAVA_HOME` is set correctly, other Java apps (like Eclipse) work and click `idea.sh`.


----------


My configuration:

- Ubuntu 12.10 64-bit (Desktop)
- Oracle JDK 1.7
- IntelliJ Community 12

Intellij launcher doesn&#39;t work on unity?

I have committed a change and forgot to add a file to the change set. After other commits, I realized the file is now missing from a `HEAD^4` commit.

How do I rewrite a previous commit to include the missing file?

How to change past commit to include a missed file?

I find myself managing very many files (over 60 but below 70) and my commit messages so far follow this pattern:
when I have added something like on `layout.css`, my commit message is _&quot;added something on layout.css file&quot;_, and when I remove something, my commit message is _&quot;removed something from layout.css file&quot;_.

Some files down the line, I look at my commits feed and _added..._ and  _removed..._ messages dominate. Sometimes I don&#39;t remember what I removed or what I added in `layout.css` since I make so many changes at a go and so I struggle to come up with an appropriate commit message.

Is there a standard I should follow to help me come up with my commit messages?

Standard to follow when writing git commit messages

From time to time I find myself *commit-amending* using the same message.

Typically, I do:

1. Add my changes to staging area.
2. Do `git commit --amend`.
3. Wait for the text editor to open.
4. Save and close it (without changing the message).

There is anyway to tell git that I don&#39;t want to change the commit message (skipping the step of opening my text editor and saving the message)? Like:

1. Add my changes to staging area.
2. Tell git to amend my staging area to the last commit without asking me for another message.

---

I know I can avoid git firing up my text editor by doing `git commit --amend -m &quot;&lt;message&gt;&quot;`. But this way I would have to retype the message.



git commit --amend without asking for message

I made some updates on my local machine, pushed them to a remote repository, and now I&#39;m trying to pull the changes to the server and I get the message;

    error: Your local changes to the following files would be overwritten by merge:
    wp-content/w3tc-config/master.php
    Please, commit your changes or stash them before you can merge.

So I ran,

    git checkout -- wp-content/w3tc-config/master.php

 and tried again and I get the same message. I&#39;m assuming that `w3tc` changed something in the config file on the server. I don&#39;t care whether the local copy or remote copy goes on the server (I suppose the remote one is best), I just want to be able to merge the rest of my changes (plugin updates).

Any ideas?

How do I resolve git saying &quot;Commit your changes or stash them before you can merge&quot;?

When I use `git commit --amend` or `git rebase -i`, vim opens up for me to make changes. If I then change my mind and exit vim without making any changes, a commit is still made which shows up in `git reflog`.

How do I exit the editor without committing anything?

Content Type	Original Author	Original Content on Stackoverflow
Question	Jordan	View Question on Stackoverflow
Solution 1 - Git	Sean Lynch	View Answer on Stackoverflow
Solution 2 - Git	khagler	View Answer on Stackoverflow
Solution 3 - Git	Andres Canella	View Answer on Stackoverflow
Solution 4 - Git	David Leitner	View Answer on Stackoverflow

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

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Android remove Activity from back stack

Export table from database to csv file

Attributions