12 Commits

Author	SHA1	Message	Date
Nikita Galaiko	e05c30ca60	add submodules tests	2023-11-17 14:47:08 +01:00
Nikita Galaiko	97d6be48f0	refactor cherry picking	2023-10-31 08:45:53 +01:00
Nikita Galaiko	f66c1e4db7	cranky fixes	2023-10-24 14:10:06 +02:00
Nikita Galaiko	52757a4ad5	better imitate a real remote merge	2023-10-24 13:57:22 +02:00
Nikita Galaiko	c0c8ac8133	fix integrated commit detection	2023-10-24 13:49:06 +02:00
extrawurst	bb56719d1e	fix merge conflict	2023-10-18 16:45:40 +02:00
extrawurst	eb569b389c	* cleanup combined bin/lib in gitbutler ... * gitbutler as a lib is `gblib` now and used accordingly by `butler` * use `cargo-cranky` for shared lints across workspace until cargo supports Cargo.toml lints section in 1.75	2023-10-18 16:39:14 +02:00
Nikita Galaiko	6fb3cba980	correctly track local references	2023-10-18 15:17:09 +02:00
Nikita Galaiko	cba2d2fc4f	hide some methods under #cfg(test)	2023-10-12 15:35:50 +02:00
Nikita Galaiko	878c23c229	remove duplicated tests	2023-10-12 15:14:02 +02:00
Nikita Galaiko	2700be6b50	virtual branches conflict test	2023-10-12 14:25:01 +02:00
Nikita Galaiko	a71baaacb0	init integration tests	2023-10-12 10:36:48 +02:00