4974 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Jesse Duffield	027ea74ca9	merge with example feature branch	2018-06-09 22:49:40 +10:00
Jesse Duffield	37b5bc7cb3	mess with merge panel	2018-06-09 22:47:54 +10:00
Jesse Duffield	336a494862	mess with merge panel values	2018-06-09 22:44:30 +10:00
Jesse Duffield	6167eb5cc0	dealing with no checkouts in reflog and checking out new branches	2018-06-09 19:30:59 +10:00
Jesse Duffield	d413d4319f	update gitignore	2018-06-09 19:06:52 +10:00
Jesse Duffield	7653ff9a24	add support for merging	2018-06-09 19:06:33 +10:00
Jesse Duffield	4f6ae62e79	moving view helpers out of gui file	2018-06-06 12:17:49 +10:00
Jesse Duffield	ceeca40fe5	remove log of directory	2018-06-05 19:32:27 +10:00
Jesse Duffield	1378143889	move log commands into main file	2018-06-05 19:32:03 +10:00
Jesse Duffield	0d2076c57c	generalised logs	2018-06-05 19:30:55 +10:00
Jesse Duffield	68a23f14e8	remove another test file	2018-06-05 19:03:54 +10:00
Jesse Duffield	0715487730	remove get_branches bash script	2018-06-05 19:02:20 +10:00
Jesse Duffield	dd511acbdd	remove test files	2018-06-05 19:02:02 +10:00
Jesse Duffield	9cd78f719e	remove comments	2018-06-05 18:54:07 +10:00
Jesse Duffield	9c018c6138	factoring out error panel creation	2018-06-05 18:49:10 +10:00
Jesse Duffield	d1ead5b0cf	add stash panel	2018-06-05 18:48:46 +10:00
Jesse Duffield	164ac72c5a	generalise commit panel into confirmation panel	2018-06-05 18:47:57 +10:00
Jesse Duffield	d89cab146a	Switch to forked repo of gocui	2018-06-05 18:47:31 +10:00
Jesse Duffield	f2bb6128a9	Merge branch 'hotfix/test_hotfix'	2018-06-02 13:52:52 +10:00
Jesse Duffield	80bcc7c16e	More stuff	2018-06-02 13:51:03 +10:00
Jesse Duffield	a0c8fc8899	loading file diff after refreshing files incase cursor is now at a different file	2018-06-02 09:06:02 +10:00
Jesse Duffield	7cdcef8c93	picking up new files upon file refresh	2018-06-02 09:05:20 +10:00
Jesse Duffield	5ccea4f5d9	ignore notes	2018-06-02 09:03:39 +10:00
Jesse Duffield	157278e06e	stop tracking notes	2018-06-02 08:45:30 +10:00
Jesse Duffield	103a6fd219	logging durations and more stuff	2018-06-02 08:35:49 +10:00
Jesse Duffield	a555a75565	clearing status before re-writing contents	2018-06-01 23:25:15 +10:00
Jesse Duffield	b6eaa44cc2	more stuff	2018-06-01 23:23:31 +10:00
Jesse Duffield	ec78c795dd	More stuff	2018-05-27 16:32:09 +10:00
Jesse Duffield	787e5d13ed	Showing modal when no files to commit	2018-05-26 17:18:00 +10:00
Jesse Duffield	843927dd26	more fixing	2018-05-26 16:08:18 +10:00
Jesse Duffield	06713f608b	fixing up commit message deletion	2018-05-26 16:08:08 +10:00
Jesse Duffield	112893f73c	reverting to using delete	2018-05-26 15:51:28 +10:00