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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |