Tags » Git

Git diff and merge tool with Intellij Idea

Windows


    tool = intellij

    cmd = cmd.exe //c "\"c:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 2016.2.4/bin/idea.bat\" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
    trustExitCode = true


    tool = intellij

    cmd = cmd.exe //c "\"c:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 2016.2.4/bin/idea.bat\" diff \"$LOCAL\" \"$REMOTE\""
… 117 more words
Programming

[Git] Git diff without comparaison file mode

Issue when execute git diff command on a file and got :

diff --git a/your_file b/your_file
old mode 100644
new mode 100755

If you see this, it is because the permissions of your_file has changed. 50 more words

Linux

Edit last git commit message

If you have accidently entered wrong commit message or want to add something more to it?

Here is the command:

git commit --amend

It’ll open a text editor window and lets you edit the commit message in the first line. 11 more words

Git

What is Git SCM? Summary from Git's site

git is a software that manages the timely snapshots of your source code.

Git stores and thinks about information much differently than these other systems, even though the user interface is fairly similar, and understanding those differences will help prevent you from becoming confused while using it. 1,197 more words

Ruby On Rails

Git add not working for folder with .git folder

Also you might get something like
fatal: Pathspec ‘some.file.name.goes.here’ is in submodule ‘some/folder/name’
Also you might notice, if you commit and pushed, only some skeleton of the of the folder structure without the actual files would be committed. 92 more words

git delete all local branches except some

Sometimes after a sprint, all the remaining branches are just taking up space.
Here’s a small snippet to remove all your local branches in one go. 70 more words

Rubu On Rails

TeamCity queries with powershell (for sake of healthy develop)

In the last entry I’ve shown how to create a PowerShell based git hook, passing following parameters to the hook for sake of validating it. The parameters were: 268 more words

Git