Commit Graph

19 Commits

Author SHA1 Message Date
Jacob Kiers
921f2f5f4b Use spaces instead of tabs in gitconfig.
Signed-off-by: Jacob Kiers <jacob@alphacomm.nl>
2014-03-07 10:48:10 +01:00
Jacob Kiers
ba11b6cb8f Added shortcut for work git server.
Signed-off-by: Jacob Kiers <jacob@alphacomm.nl>
2014-02-27 11:02:53 +01:00
Jacob Kiers
c1c5317363 Use git 2.0 push strategy (simple).
Signed-off-by: Jacob Kiers <jacob@alphacomm.nl>
2014-01-22 20:22:26 +01:00
Jacob Kiers
896c47d0f8 Always use verbose commit.
Signed-off-by: Jacob Kiers <jacob@alphacomm.nl>
2014-01-08 15:28:57 +01:00
4dec622143 Added git aliases.
Signed-off-by: Jacob Kiers <jacob@jacobkiers.net>
2013-10-31 14:01:42 +01: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
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
d43df3b1b4 Git: conflicts alias. 2013-02-12 10:03:39 +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
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
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
41cefe2dc1 Refactoring and some tweaks. 2012-10-22 12:01:42 +04:00