Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 32 additions and 22 deletions.
  1. +22 −14 Sublime Text 2/Packages/User/Preferences.sublime-settings
  2. +10 −8 gitconfig
View
36 Sublime Text 2/Packages/User/Preferences.sublime-settings
@@ -1,16 +1,24 @@
{
- "color_scheme": "Packages/Color Scheme - Default/Mac Classic.tmTheme",
- "font_face": "Monaco",
- "font_options":
- [
- "no_bold",
- "no_italic"
- ],
- "font_size": 10,
- "ignored_packages":
- [
- "TrailingSpaces",
- "Perforce"
- ],
- "zzzz": "keep this at the bottom to avoid juggling trailing commas"
+ "auto_complete_commit_on_tab": true,
+ "color_scheme": "Packages/Color Scheme - Default/Mac Classic.tmTheme",
+ "draw_white_space": "all",
+ "ensure_newline_at_eof_on_save": true,
+ "find_selected_text": true,
+ "font_face": "Monaco",
+ "font_options": [
+ "no_bold",
+ "no_italic"
+ ],
+ "font_size": 10,
+ "highlight_line": true,
+ "ignored_packages": [
+ "TrailingSpaces",
+ "Perforce"
+ ],
+ "open_files_in_new_window": false,
+ "remember_open_files": false,
+ "save_on_focus_lost": true,
+ "translate_tabs_to_spaces": true,
+ "trim_trailing_white_space_on_save": true,
+ "zzzz": "keep this at the bottom to avoid juggling trailing commas"
}
View
18 gitconfig
@@ -6,14 +6,16 @@
# ui = true
[core]
editor = vim
- quotepath = false
- pager = less -FRSX
+ quotepath = false
+ pager = less -FRSX
[github]
- user = olifante
+ #user = olifante
+ #user = tiago-g-henriques
[alias]
st = status
ci = commit
cm = commit -m
+ cam = commit -am
#br = branch
co = checkout
df = diff
@@ -46,11 +48,11 @@
"!f() { git ls-files --unmerged | cut -f2 | sort -u }; mate `f`"
# "!f() { git status --porcelain | grep '^UU' | cut -d' ' -f2 }; mate `f`"
[push]
- default = tracking
+ default = tracking
[branch]
- autosetuprebase = always
+ autosetuprebase = always
[branch "master"]
- rebase = true
+ rebase = true
[diff]
tool = p4diff
@@ -89,5 +91,5 @@
trustExitCode = false
[user]
- name = Tiago Henriques
- email = trinosauro@gmail.com
+ name = Tiago Henriques
+ email = trinosauro@gmail.com

No commit comments for this range

Something went wrong with that request. Please try again.