| 
							
							
								 Jesse Duffield | 67e56e5fbc | support carriage returns for windows machines | 2018-08-05 17:13:12 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 79703c0087 | Merge pull request #13 from TonyChol/patch-1 Fixed a typo in README.md | 2018-08-05 16:37:12 +10:00 |  | 
			
				
					| 
							
							
								 Zhibin Cai | 74cb78cbe6 | Fixed a typo in README.md Fixed a typo about zsh alias: `echo "alias lg='lazygit'" >> ~/.zshrc` | 2018-08-04 23:21:06 -07:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 3c0eeba187 | Update README.md | 2018-08-05 14:13:21 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | e21f840350 | fix readme | 2018-08-05 13:03:09 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | d780549cea | Merge pull request #2 from robertely/patch-1 Correct gocui link | 2018-08-05 12:45:51 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 12f475544e | Create LICENSE | 2018-08-05 12:32:37 +10:00 |  | 
			
				
					| 
							
							
								 Robert Ely | b422c5cc86 | Correct gocui link | 2018-08-04 19:40:04 -06:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 3790ef3e46 | add tab keybinding back in | 2018-07-29 10:46:37 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 5c271b8a70 | add navigate option to every panels options | 2018-07-29 10:40:54 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 8b0db89edb | Update README.md | 2018-07-29 10:30:40 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 2dfef09e55 | show whitespace in diffs again | 2018-07-28 16:52:20 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | d6dbd46793 | fix view cycling | 2018-07-22 12:58:39 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 001ea1002d | update options | 2018-07-22 12:58:09 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 5dbe262d2d | moving loader and adding previous view function (unfinished) | 2018-07-22 12:07:36 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | f0447be989 | removing test files | 2018-07-21 18:55:19 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | d832eab20c | loading animation for confirmation view | 2018-07-21 18:37:00 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | fab194e923 | better handling of merge conflicts | 2018-07-21 17:48:27 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | a47c889cbb | merge with develop | 2018-07-21 16:06:38 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 61dcbb456d | updating doc | 2018-07-21 16:00:05 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 37d9ed6712 | test script to make repo with a merge conflict | 2018-07-21 15:57:54 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | e059a87ae2 | refreshing files if there's an error while pulling because chances are it's a merge conflict | 2018-07-21 15:57:23 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 087cc7362a | merge develop | 2018-07-21 15:55:47 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 16df4786c0 | fix up code that was used to test this very application (yes I'm ashamed) | 2018-07-21 15:53:52 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | dea751280e | better handling of branches and untracked files | 2018-07-21 15:51:18 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | bcdfe242ac | Update README.md | 2018-06-10 12:56:38 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 0a1c4b7cbe | Merge branch 'master' of https://github.com/jesseduffield/lazygit | 2018-06-10 12:55:26 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 42cb8e4abf | remove y/n options from prompt | 2018-06-10 12:55:15 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | e80be83065 | Update README.md | 2018-06-10 12:52:55 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | b2e0bb49fb | Update README.md | 2018-06-10 12:49:12 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 36df4c825f | Update README.md | 2018-06-10 12:27:22 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 56bf7cfee8 | Update README.md | 2018-06-10 12:11:40 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 76d4c62995 | Update README.md | 2018-06-10 11:53:16 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 4a483c112e | better confirmation panel messages | 2018-06-10 11:52:30 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 211715fa77 | merge with feature branch | 2018-06-10 11:48:22 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 5a143ea500 | this will cause a conflict | 2018-06-10 11:48:07 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 5fd3d11789 | Merge branch 'master' of https://github.com/jesseduffield/lazygit | 2018-06-10 11:37:24 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 691972b544 | scroll to merge conflict | 2018-06-10 11:37:10 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 21dd06989d | add handler for refreshing files | 2018-06-10 11:36:47 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 43f0cf42e6 | use log instead of diff for now | 2018-06-10 11:36:27 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 08174ca848 | Update README.md | 2018-06-10 11:35:35 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 5e3481ca58 | Update README.md | 2018-06-10 11:16:47 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | dda94949d4 | Update README.md | 2018-06-10 00:49:13 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 7f01bfa24e | Update README.md | 2018-06-10 00:43:11 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 4750aacb9b | Update README.md | 2018-06-10 00:40:54 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | ea51578f5c | Update README.md | 2018-06-10 00:40:33 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 57611d355c | Update README.md | 2018-06-10 00:37:03 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 595959db52 | Update README.md | 2018-06-10 00:10:28 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 129be0b364 | Update README.md | 2018-06-10 00:07:25 +10:00 |  | 
			
				
					| 
							
							
								 Jesse Duffield | 30ce316209 | Create README.md | 2018-06-10 00:06:06 +10:00 |  |