Commit Graph

37 Commits

Author SHA1 Message Date
Artem Sapegin
690edd82c5 Revert Python path. 2013-10-30 23:33:36 +04:00
Artem Sapegin
9d4659ca3f Git: commerge alias, merge options.
1. commerge: commit resolved conflict without editing message.
2. Do not open editor on successfull merge.
2013-10-29 13:04:26 +04:00
Artem Sapegin
5883f46330 Bash: fix $PATH construction.
Replace global $PATH to ensure correct order.
2013-10-29 13:03:07 +04:00
Artem Sapegin
8390301c8b Slate config. 2013-10-11 17:16:12 +04:00
Artem Sapegin
b2a15d142b OSX: Tweak Mission Control. 2013-10-04 17:14:11 +04:00
Artem Sapegin
285ac66517 Bash: Grunt and Tamia completeon. 2013-10-03 21:20:54 +04:00
Artem Sapegin
1fca62c5e3 Gems bin path. 2013-04-25 17:47:58 +04:00
Artem Sapegin
90fa99a47a Git: Any GitHub repo with my username should be checked out r/w by default 2013-03-01 15:50:24 +04:00
Artem Sapegin
880127549c Git: DiffMerge. 2013-02-24 23:24:42 +04:00
Artem Sapegin
21c560da58 Git: Disable crlf settings. 2013-02-20 00:08:43 +04:00
Artem Sapegin
7e16d90f34 Ack tweaks. 2013-02-18 16:04:14 +04:00
Artem Sapegin
189a101ac5 msmtp and mutt. 2013-02-16 01:10:43 +04:00
Artem Sapegin
b50c6b6904 .ackrc. 2013-02-15 12:27:08 +04:00
Artem Sapegin
313af0857d Merge branch 'master' of github.com:sapegin/dotfiles 2013-02-12 10:05:59 +04:00
Artem Sapegin
d43df3b1b4 Git: conflicts alias. 2013-02-12 10:03:39 +04:00
Artem Sapegin
77d1dc9db8 Python. 2013-02-11 00:14:51 +04:00
Artem Sapegin
e7cfad0c8c Bash: Linux compatibility. 2013-02-04 14:33:53 +04:00
Artem Sapegin
dede296618 Bash: some+ aliases generator + few tweaks. 2013-01-10 14:56:34 +04:00
Artem Sapegin
9fbc0e4bb3 Bash/Git: Refactor Git aliases, remove aliases exists in git-extras. 2012-12-14 20:01:44 +04:00
Artem Sapegin
ab3cb53a00 Git: conflicts alias. 2012-12-13 16:27:12 +04:00
Artem Sapegin
38359da2f6 Bash: New aliases + prevent duplicates in $PATH + some refactoring. 2012-12-13 16:26:57 +04:00
Artem Sapegin
3ccdb8b7e2 Bash: Unify color output. Prompt refactoring. 2012-12-12 16:52:29 +04:00
Artem Sapegin
3d02d94960 Bash: some cleaning. 2012-12-12 15:18:25 +04:00
Artem Sapegin
7d9574d664 Git: New aliases. 2012-12-07 00:55:32 +04:00
Artem Sapegin
b5c560b68a Git: autocrlf = input. 2012-12-06 17:54:44 +04:00
Artem Sapegin
f9d776b7f1 Bash: Fix (a bit) Home/End keys in Terminal.app. 2012-12-06 17:54:24 +04:00
Artem Sapegin
7ced2299c8 Bash: Add NPM bin directory to $PATH. 2012-12-06 17:53:49 +04:00
Artem Sapegin
24d0b516d2 Merge branch 'master' of https://github.com/sapegin/dotfiles 2012-11-28 12:43:33 +04:00
Artem Sapegin
c1f4d1730e Bash: Remove duplicate SSH autocomplete. 2012-11-28 12:41:42 +04:00
Artem Sapegin
4818757bb1 Git: local identity.
~/.gitlocal works only in Git 1.7.10.2 but .gitlocal works in 1.7.10.
2012-11-28 12:21:17 +04:00
Artem Sapegin
b3c10d50d5 Git: Remove shit + add comment about required Git version. 2012-11-27 18:25:32 +04:00
Artem Sapegin
aefeaec405 Git: Better diff colors. 2012-11-27 18:25:32 +04:00
Artem Sapegin
fa7e0af397 Git: disable safecrlf. 2012-11-09 14:06:09 +04:00
Artem Sapegin
bcc05fd0d7 Inputrc: add history-preserve-point option. 2012-11-09 14:06:09 +04:00
Artem Sapegin
ab99aec845 Git: update global gitignore. 2012-11-06 21:06:09 +04:00
Artem Sapegin
7ba3fe2bb9 Small fixes. 2012-10-22 12:32:31 +04:00
Artem Sapegin
41cefe2dc1 Refactoring and some tweaks. 2012-10-22 12:01:42 +04:00