493 commits

Author	SHA1	Message	Date
Stephan Dilly	51c9085d7c	user confirm merge (#565)	2021-03-03 22:06:41 +01:00
Stephan Dilly	36c124f9e3	refresh compare state at the right time (#564)	2021-03-03 18:40:00 +01:00
Stephan Dilly	1714fbad49	support conflict-free merge-commit (#561) ... * support conflict-free merge-commit	2021-03-02 12:49:12 +01:00
Stephan Dilly	bead96db08	workaround for rust nightly clippy bug	2021-03-02 09:23:34 +01:00
Stephan Dilly	7de5265d5d	clippy fixes	2021-03-02 00:21:16 +01:00
Stephan Dilly	4126de0ec7	rename	2021-03-01 14:36:09 +01:00
Stephan Dilly	26d63a37a0	show progress in spinner when push/pull is ongoing	2021-03-01 14:35:37 +01:00
Stephan Dilly	ee9ae4b2fd	changelog update (#556) ... + small renaming	2021-03-01 14:20:47 +01:00
Stephan Dilly	4d4761ed21	fix fetch notifications (#555) ... * fix fetch notifications * actually show fetch transfer progress * reduce sleep because it significantly slows down fetching	2021-03-01 12:32:39 +01:00
Stephan Dilly	dfa4d7789d	only even try to ff merge when there is something incoming (#554) ... * Update pull.rs	2021-03-01 11:10:25 +01:00
Stephan Dilly	102b0b31fb	file rename	2021-03-01 09:51:15 +01:00
Stephan Dilly	a8690e6e24	rename	2021-03-01 09:49:17 +01:00
Stephan Dilly	67f3a13716	only show non-clean repo states (#553) ... * only show repo state if not clean	2021-03-01 00:12:09 +01:00
Stephan Dilly	97f88a2f2f	rename	2021-02-28 19:34:45 +01:00
Stephan Dilly	bd54b47d19	rename fetch to pull	2021-02-28 19:25:16 +01:00
Stephan Dilly	39fb65b396	Async fetch (#552) ... * async fetch * reuse remote progress for fetch * prvent push/fetch popup from closing too soon	2021-02-28 19:24:05 +01:00
Stephan Dilly	c96feb0fe6	branch merge from upstream (#384) ... * better structure of all branch functions * support and unittest fast forward merge	2021-02-28 01:55:35 +01:00
Stephan Dilly	8d4c1ca26e	don't close branchlist every time (#550) ... * do not close branchlist after branch rename * do not close branchlist after deleting a branch * closes #543	2021-02-25 15:54:18 +01:00
Antonio Yang	7b94358d11	Fix vim default config (#549)	2021-02-25 14:59:45 +01:00
Stephan Dilly	6482c81382	support left arrow to go back grom commit details (closes #418)	2021-02-24 22:12:23 +01:00
Stephan Dilly	546c7f3072	fix some potentials for errors to bubble up (#547) ... * fix some potentials for errors to bubble up (#490) * fix async diff failing panic	2021-02-24 21:54:27 +01:00
Stephan Dilly	bde8eb8a7b	Revert "Support mouse scrolling (#306)" ... This reverts commit 457f644f30.	2021-02-24 11:38:30 +01:00
Stephan Dilly	a53ec16161	prefer 'origin' as default remote if it exists (#544) ... closes #494	2021-02-24 11:04:01 +01:00
Stephan Dilly	8b449f5d9e	clear commit msg after doing a commit	2021-02-24 10:21:10 +01:00
Stephan Dilly	1b8b58a31c	fix missing paging support in branch list (#539) ... closes #519	2021-02-23 19:07:01 +01:00
Stephan Dilly	e3bb51b277	show branchname in commit mssage box (closes #529)	2021-02-23 16:50:36 +01:00
Stephan Dilly	5244751e9e	check if we can_push before trying (#533) ... closes #531	2021-02-23 12:32:32 +01:00
Stephan Dilly	388a6e62fb	keep uncommitted msg around. ... when adding *amend* this got broken because in that case we want to clear out the msg when it was not confirmed	2021-02-23 11:54:53 +01:00
Stephan Dilly	318498c8ee	more clippy fixes	2021-02-23 11:33:24 +01:00
Richard Menzies	457f644f30	Support mouse scrolling (#306) ... Linked to #226	2021-02-23 11:03:50 +01:00
Richard Menzies	6c974ee1d3	Support force push (#421)	2021-02-23 11:02:16 +01:00
remique	b5411e28a5	Set MacOS config directory to ~/.config (#379)	2021-02-16 22:52:32 +01:00
Richard Menzies	a2a6754990	Change test_invisable_newline to test_invisible_newline	2021-02-09 09:31:48 +01:00
David Karrick	530e077fe7	Allow user to set theme with flag (#481) ... closes #480	2021-01-27 22:24:27 +01:00
Stephan Dilly	02990204e1	fix crash when no remote called 'origin' present (#486)	2021-01-12 16:17:14 +01:00
Stephan Dilly	b63063271d	cleanup nightly clippy warnings	2021-01-08 11:55:50 +01:00
Stephan Dilly	c428db09f6	support showing char count (closes #466)	2020-12-27 14:11:19 +01:00
Stephan Dilly	c0d0e31186	more comment	2020-12-26 11:34:30 +01:00
Stephan Dilly	f927c609d4	fix help text	2020-12-26 11:34:25 +01:00
Stephan Dilly	24758d494d	single lookup place for key symbols in preperation for #465	2020-12-26 11:32:10 +01:00
Stephan Dilly	5080b822f1	Freebsd fix compilation (#462)	2020-12-22 15:52:33 +01:00
Stephan Dilly	c19567e59b	fix rust_analyzer choking on local use	2020-12-22 13:17:10 +01:00
Stephan Dilly	6fcbb99faf	fix clippy on nightly	2020-12-22 10:17:14 +01:00
Stephan Dilly	79939115af	Fix style (#454)	2020-12-20 17:07:32 +01:00
Stephan Dilly	2b7d7f467b	Set tracking branch on push (#452) ... set upstream on each push (if not already defined). closes #275	2020-12-20 16:48:47 +01:00
Stephan Dilly	44ba5a83c9	show branch ahead/behind only if upstream is set (#451) ... closes #385	2020-12-20 16:01:04 +01:00
Stephan Dilly	779b2d572f	fix clippy and unittest	2020-12-19 21:45:09 +01:00
Stephan Dilly	3ff77e0669	fix whitespace not showing cursor in text input (closes #247)	2020-12-19 21:25:37 +01:00
Stephan Dilly	23ffeb8bea	fix multiline textinput drawing (closes #405)	2020-12-19 19:40:15 +01:00
Stephan Dilly	cfedbd1b36	fixes #448 ... * annotate a change in the keybindings more explicitly * log error reading key bindings into log	2020-12-19 17:01:12 +01:00