Commit Graph

17 Commits

Author SHA1 Message Date
Yan Pritzker
2d1130e740 Merge pull request #545 from jeffwidman/patch-1
Update gitignore vim settings
2014-10-24 14:55:16 -05:00
Yan Pritzker
e2f73a0d02 Merge pull request #511 from nikolai-b/git-config-fix
remove outdated git option
2014-10-24 14:55:00 -05:00
Jeff Widman
c25cc91b6f Update gitignore vim settings
Pulling in updates from Github's global vim gitignore file:  https://github.com/github/gitignore/blob/master/Global/vim.gitignore
2014-10-17 15:34:20 -07:00
Yan Pritzker
d4581ce37c Increase number of recent branches 2014-09-30 11:41:12 -05:00
Luiz Gonzaga dos Santos Filho
ba5cf1b78c Ignoring just "tags" is too generic
My application had a folder named "tags" as part of its business rules and because of this it got ignored.
I believe upadting this section according to the very link in the comment above should fix it. (not ignoring `tags/` folder).
2014-09-23 08:47:59 -03:00
Nikolai B
11ee42c0ba remove outdated git option 2014-07-17 10:21:10 +01:00
Yan Pritzker
a6baee0a54 Rename git changelog => git simple to avoid conflict with git-extras 2014-02-15 21:09:33 -06:00
jeremyclement
dab4deb324 just a spelling mistake in comment 2013-11-15 16:09:15 +01:00
Yan Pritzker
28eb379dbd Fix gitconfig colors causing iTerm with solarized to show diffs incorrectly 2013-11-03 21:17:04 -06:00
Yan Pritzker
bfc1ca5b71 git recent-branches - tell me what i worked on recently 2013-10-09 13:56:30 -05:00
Yan Pritzker
5b850667cd Git snapshot: take a snapshot and stash it without messing with your working tree 2013-09-17 22:38:56 -05:00
Daryl Robbins
2ef4d93ce4 Added support for git user configuration. Gitconfig will now include the configuration from ~/.gitconfig.user, if it exists. The include is done at the end of gitconfig, so that it can override any of the default values. 2013-03-23 12:28:32 -04:00
Christian Treppo
b368dfd0a7 Configure Macvim as the standard git mergetool
Why use something else than Macvim with fugitive.vim as a mergetool?
2013-01-06 18:02:02 +01:00
Mark Cornick
4b5b1ab160 Fix excludes file in gitconfig
It was pointing to .yadr/gitignore_global, a symlink that no longer
exits. Point it to .yadr/git/gitignore instead.
2012-04-06 13:46:45 -04:00
yan
d7325f1470 Fix 'git l' (aliased to 'gl') mapping which was not working 2012-03-07 23:14:43 -08:00
Bastien Jaillot
9405f6c7c4 Change gitignore_global to yadr one 2012-02-25 16:54:18 +01:00
Kyle West
e2b68c4a4e moved gitconfig and ignore to git directory. symlinks created but will be removed at some point. 2012-01-24 22:43:08 -05:00