18 commits

Author	SHA1	Message	Date
extrawurst	cce49a34b7	Revert "Change diff renamed files (#1040)" ... This reverts commit 5f466ff983.	2022-04-24 22:30:40 +02:00
Gleb Davydov	5f466ff983	Change diff renamed files (#1040)	2022-04-24 19:25:50 +02:00
Stephan Dilly	d5d36de01e	implement reverting commit from revlog (#1057)	2021-12-29 16:40:22 +01:00
Stephan Dilly	006cdd6373	support bare repos (#1028)	2021-12-05 00:35:45 +01:00
R0nd	153c79a828	support pull from remote (#945) ... closes #920	2021-10-13 15:34:58 +02:00
Stephan Dilly	e4c7867564	allow rebase with conflicts (#897)	2021-09-29 18:55:47 +02:00
Stephan Dilly	f8bad7d541	cleanup	2021-09-29 17:07:59 +02:00
Stephan Dilly	cfea72d709	rebase returns generated commit + unittest	2021-09-06 21:20:45 +02:00
Stephan Dilly	a8654329ec	allow rebase of a branch (#816)	2021-08-26 20:31:37 +02:00
Stephan Dilly	dad8e8d43d	cargo fmt: use hardtabs ... since it does not support hard-whitespaces its the only way to make whitespaces consisitent and checked	2021-08-17 14:24:25 +02:00
Kieran Siek	a11c0b5eb6	Use libgit2 to get the merge commit message. (#755)	2021-06-01 17:29:24 +02:00
Stephan Dilly	53f65c8377	assert that merge msg is populated correctly	2021-06-01 16:27:37 +02:00
Stephan Dilly	8767642f93	allow pull that creates conflicts now	2021-05-12 15:24:35 +02:00
Stephan Dilly	f35ce0cbf4	support doing merge commit (#701)	2021-05-12 11:20:39 +02:00
Stephan Dilly	a073e0ac02	preserve ref name in annotated commit	2021-05-12 09:13:28 +02:00
Stephan Dilly	b5327a65c1	rename	2021-05-12 09:01:08 +02:00
Stephan Dilly	f30ec49886	show merge head ids in merge state (#697)	2021-05-11 18:26:12 +02:00
Stephan Dilly	4f6aceb3ec	merging a branch (#696) ... * merging arbitrary branch * cleanup intermediate in-merge state	2021-05-09 22:53:12 +02:00