Git is a very popular version control system and Sublime Text is very popular text editor tool. If you are new to sublime text editor then I recommend you to read Sublime Text Plugins, Tips and Settings.This post explains step by step on how to use Git plugin into Sublime Text editor to increase development productivity. On a Mac, it is important to remember to add.DS_Store (a hidden OS X system file that's put in folders) to your.gitignore files. If you want to never include.DS_Store files in your Git repositories, you can configure your Git to globally exclude those files. All global configuration for Sublime (including installed packages) is stored in ~/.config/sublime-text-3 (or%APPDATA Sublime Text 3 on Windows, or ~/Library/Application Support/Sublime Text 3 on Mac). We will reference the Linux folder for the rest of this tutorial, but replace with your own path if using a different OS.

Install Sublime Text Mac
Sublime Text 3 Git Plugin
Download Sublime Text For Mac

Active11 months ago

When I do a git diff in my branch I see that line endings have the characters ^M:

I want to replace these with Unix line endings before committing my changes.

I am using Ubuntu 14.04, git and sublime text 3.

Thanks for your help.

Install sublime text mac. Make your game stand out with Rich Presence. Engage our 150+ million users by integrating your game with Discord. Rich Presence makes it easy for players. It seems like the ratio of Atom/Sublime is slightly higher in Dublin compared to San Francisco.) The iOS simulator is very different than how the actual device works. You must test on a real device, especially if your code runs when the screen is locked or off.

EDIT:

I am looking for a way to change line endings in sublime text 3 not using other utilities or commands.

Achraf JEDAY

Achraf JEDAYAchraf JEDAY

4081 gold badge5 silver badges12 bronze badges

5 Answers

You can use dos2unix command in linux (package dos2unix) or change line endings in Sublime Text under menu item View / Line Endings.

Jan ČejkaJan Čejka

This can be done without a plugin via the menu at the top or though the statusbar (but you need to enable the feature).

To change it through the menu at the top click View -> Line Endings -> Select desired line ending type.

To enable this through the status bar:Click Preferences -> SettingsThen add 'show_line_endings': true, somewhere between the {} brackets on the right-hand side.Finally, save your changes.

This enables a small section on the right of the status bar that shows up at the bottom. It tells you the current EOL encoding and by clicking the box and selecting a different type it changes the files EOL character for you.

Another helpful option is file encoding which can be enabled in the statusbar as well by following the same setups above but also adding 'show_encoding': true, between the {} marks.

K.B.K.B.

^M is r (Control-M, or carriage return).

This is likely because the user who committed the file was using windows, which uses rn for its line endings. Linux uses only n, hence you see the ^M Using google voice for text on messages app mac. at the end of the line.

You probably want to do one of the following:

'Fix' the file to have n line endings (using a tool such as dos2unix) and commit. In which case you'll be fighting with the other user unless you can get them to do the below.
Configure both of your git installations to handle line endings correctly for each environment - e.g: https://stackoverflow.com/questions/10418975/how-to-change-line-ending-settings
Configure Sublime to open the file with 'Windows line endings'

AttieAttie

13.8k4 gold badges37 silver badges52 bronze badges

I found a sublime text plugin that converts line endings in all open files to Unix/Windows/Mac OS 9.

Installation

Open Sublime and go to Preferences > Browse Packages. This will opena window.
Download or clone the contents of this repository to a folder namedexactly as the package name into the Packages/ folder you opened in the previous step:

/home/YOUR_USERNAME/.config/sublime-text-3/Packages

Usage

Go back to sublime and open all the files that you want to convert.
Once all of the files are open hit CTRL + SHIFT + P, and search andselect “Line Ending to all view: Unix”.
Hit CTRL + ALT + S to save all of the open files.

Achraf JEDAYAchraf JEDAY

4081 gold badge5 silver badges12 bronze badges

To whom may not want to install additional plugin to remove ^M new lines,

In sublime text setting, add 'trim_trailing_white_space_on_save': true, to auto remove space when saving. (This step might be optional)
On the file you are opening, click right bottom corner of sublime text. Change Windows to Unix and save.

^M is gone. Enjoy.

harrrrrrryharrrrrrry

Not the answer you're looking for? Browse other questions tagged gitubuntu-14.04sublime-text-3 or ask your own question.

Active7 months ago

I would prefer to write my commit messages in Vim, but it is opening them in Emacs.

How do I configure Git to always use Vim? Note that I want to do this globally, not just for a single project.

Mark Amery

72.4k36 gold badges278 silver badges324 bronze badges

brasskazoobrasskazoo

39.6k22 gold badges56 silver badges73 bronze badges

20 Answers

If you want to set the editor only for Git, do either (you don’t need both):

Set core.editor in your Git config: git config --global core.editor 'vim'
Set the GIT_EDITOR environment variable: export GIT_EDITOR=vim

If you want to set the editor for Git and also other programs, set the standardized VISUAL and EDITOR environment variables*:

_{* Setting both is not necessarily needed, but some programs may not use the more-correct VISUAL. See VISUAL vs. EDITOR.}

For Sublime Text:Add this to the .gitconfig. The --wait is important. (it allows to type text in sublime and will wait for save/close event.

'subl' can be replaced by the full path of the executable but is usually available when correctly installed.

Ry-♦

176k42 gold badges361 silver badges378 bronze badges

digitaldreamerdigitaldreamer

38.1k3 gold badges26 silver badges27 bronze badges

Copy paste this:

In case you'd like to know what you're doing. From man git-commit:

ENVIRONMENT AND CONFIGURATION VARIABLES

The editor used to edit the commit log message will be chosen from the GIT_EDITOR environment variable, the core.editor c

Setting Sublime Text For Git In Mac