lvl-svasseur

[merge]
    tool = intellij
    # tool = Kaleidoscope
[diff]
    tool = intellij
    # tool = Kaleidoscope
    
# intellij mergetool config
[mergetool "intellij"]
    cmd = /Applications/IntelliJ\\ IDEA\ 13\\ CE.app/Contents/MacOS/idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")

lvl-svasseur

# https://gist.github.com/driesvints/5960662
# Ensures all line endings are committed as LF, but will checkout with native line endings
* text=auto

# -- Override Section, just in-case Git tries to be sneaky

# Ensure that these files are recognized as text
*.asp         text
*.aspx        text
*.asx         text

lvl-svasseur

-Go to the starting point of the project
>> git checkout origin master
-fetch all objects
>> git fetch origin
-Make the branch from the tag
>> git branch new_branch tag_name
-Checkout the branch
>> git checkout new_branch
-Push the branch up
>> git push origin new_branch