linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-24 04:29:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4,557 commits 1 branch 0 tags 168 MiB
Commit graph

31 commits

Author SHA1 Message Date
Gaetan Semet
e027530ca5 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	.gitignore
 2016-05-26 15:28:55 +02:00
Marc Cornellà
54ace41f3c Tidy up gitignore file 
- `custom/example.zshcache` doesn't exist anymore: it's safe to
  ignore.

- `*.swp` files are ignored for no apparent reason. There's nothing
  in the codebase that generates them. This was introduced by @lepht
  in commit f78218f6 on 24 May 2011.

- Files `locals.zsh` and `projects.zsh` are no longer supported for
  putting custom configuration there.

  This is since commit 8debd09 where files were put in a lib/
  folder, but failed to modify the .gitignore file as well.

  The init script was modified as well, so those files aren't even
  being sourced: they are safe to be deleted or ported into a custom
  script.
 2016-05-12 13:53:05 +02:00
Marc Cornellà
66e7e7d9ca Use .gitkeep files to keep cache/ and log/ directories 
Instead of .easter-egg files we now have empty .gitkeep files,
like is done as an informal standard.
 2016-05-12 13:52:34 +02:00
Gaetan Semet
7c206c1295 gitignore 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-11-23 01:20:06 +01:00
Gaetan Semet
72646c66a0 allow modification in customs dir 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-07-03 16:15:24 +02:00
Gaetan Semet
5afa441d66 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	templates/zshrc.zsh-template
 2014-03-24 11:54:41 +01:00
Robby Russell
668886e203 Merge pull request #1117 from Peeja/move-example-plugin 
Move example plugin to the custom plugins directory.
 2014-03-22 15:58:00 -07:00
Gaetan Semet
24f2838f0b Merge remote-tracking branch 'upstream/master' 
Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
	themes/ys.zsh-theme
 2013-12-03 09:41:48 +01:00
Gaetan Semet
62e40902ff Merge remote-tracking branch 'upstream/master' 
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
 2013-10-25 16:03:23 +02:00
Kaiwen Xu
e3c489bd08 Minor gitignore fix. 
(Sorry my bad).
 2013-10-25 01:40:55 -04:00
Kaiwen Xu
a7693b096f gitignore fix for custom folder. 2013-10-13 15:49:24 -04:00
Gaetan Semet
bd32698531 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	templates/zshrc.zsh-template
 2013-09-24 14:30:27 +02:00
Stibbons
14669197f0 ignore eclipse workspace dir 
Signed-off-by: Stibbons <gaetan@xeberon.net>
 2013-09-18 00:11:28 +02:00
yleo77
a9111488e4 add search by filename and file content feature 2013-05-17 17:48:06 +08:00
Gaetan Semet
f2116cf01c Also commit custom plugins (but do not pull on upstream) 2013-03-27 10:12:22 +01:00
Carlos Cardoso
2deeed1301 redirecionamento de vim para 7.3 2013-03-27 10:08:12 +01:00
Carlos Alexandro Becker
75e5a6dcfc fixes my wrong commit - fixes #1423 2012-11-25 20:34:12 -02:00
Carlos Alexandro Becker
72974ce409 totvs utils 2012-11-21 15:29:09 -02:00
Peter Jaros
af03da0dc9 Move example plugin to the custom plugins dir. 2012-05-16 14:51:52 -04:00
Fredrik Appelberg
e24230cbfb Merge branch 'master' of git@github.com:fred-o/oh-my-zsh 
Conflicts:

	.gitignore
 2011-12-08 10:02:17 +01:00
Pete Clark
8411a39a86 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into taskwarrior-plugin 2011-05-29 18:51:32 -04:00
Jake Bell
f8aae64e47 Adding ability to override plugins from the custom directory. 2011-05-26 12:34:37 -05:00
Pete Clark
f78218f625 Adds compl .swp caches to gitignore 2011-05-24 15:25:18 -04:00
Kevin Daudt
7377ba3f7a Added git-flow plugin 2011-04-29 11:54:42 +02:00
Fredrik Appelberg
0504a01012 .gitignore 2011-03-07 13:49:30 +01:00
Robin Ramael
77d05fe8ab Made git ignore everything in custom, not only the .zsh files. 2011-01-10 17:01:11 +01:00
James Cox
8a8a7bafa0 merge upstream 2009-09-23 16:14:04 +01:00
Robby Russell
19a08f15d6 not ignoring example.zsh 2009-09-23 08:05:05 -07:00
Robby Russell
ef9ce1e221 Updating .gitignore to ignore everything but the example.zsh file in custom/ 2009-09-23 08:03:38 -07:00
James Cox
93af38f154 further refactorings 2009-09-23 00:49:00 +01:00
Robby Russell
e20401e04e Adding initial gitignore file 2009-08-28 11:14:03 -07:00