9 Commits

Author	SHA1	Message	Date
Jesse Duffield	9489a94473	Make merge panel its own panel	2018-12-11 22:02:12 +11:00
Jesse Duffield	e0ff46fe53	more work on rebasing including visual indicators	2018-12-11 09:39:54 +11:00
Glenn Vriesman	cce6f405a5	Making ci happier	2018-12-11 09:39:54 +11:00
Glenn Vriesman	e39d2ed44b	Added check to invoke continue/refresh	2018-12-11 09:39:54 +11:00
Jesse Duffield	ff856b7630	fetching branches without checking out	2018-12-08 11:51:47 +11:00
Jesse Duffield	7e1e97d050	dont panic when catting directories	2018-08-28 19:12:35 +10:00
Mark Kopenga	88e1a815fe	Fixed comment on issue #137 from @jesseduffield	2018-08-16 07:16:32 +02:00
Mark Kopenga	7e926cf41d	Added translation for pkg/gui/ confirmation_panel.go gui.go merge_panel.go	2018-08-15 10:53:05 +02:00
Mark Kopenga	dfafb98871	tried to update to latest master	2018-08-14 11:05:26 +02:00