Tags » Git

[GIT command] Compare two branchs

# git branch
* master
another_branch

Git diff command allows to list the different files between the two branchs
# git diff –name-status master..another_branch

Git

fatal: refusing to merge unrelated histories

When you already have some thing in your git repo for example you created a git repo on github with readme file and then tried to push your local code first time to that github repo. 67 more words

Linux

Adding local code to github

Github is a great source of sharing your code with other developers. It allows you to create free repositories online.

Follow the steps below to create a repo on github and upload your code to that repo to make it public… 138 more words

Linux

Git Ignore further watching for file

If you have committed a file to git and now you want git to ignore or stop wathcing file for further modifications you need to use following command… 12 more words

Linux

New Event of RailsGirls on Buenos Aires

This 18 and 19 of November 2016, is the new event of RailsGirls on Buenos Aires, check this link for more information about that!

http://railsgirls.com/buenosaires

Good Luck!

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

Setting up git on local system

Developers often need to set a local git repository or local git server where you can save versions of your code.

Here is a way to go. 95 more words

Linux