18 Commits

Author	SHA1	Message	Date
Caleb Owens	2a3f0e8a04	Fix (some) wrong files displaying in edit mode	2024-09-17 14:31:58 +02:00
estib	4dca18ff3e	fix: Calculate the right file tree when resolving ... Get the correct file tree when resolving a conflict	2024-09-18 11:11:00 +02:00
Caleb Owens	be4652653a	Handle merge commits better in edit mdoe	2024-09-13 17:20:13 +02:00
Caleb Owens	6e7aefd5c3	Merge commiting	2024-09-11 14:47:36 +02:00
Caleb Owens	191686ec4d	Ahhh, don't loose shit	2024-09-11 11:23:20 +02:00
Kiril Videlov	95e946b8a1	Remove unnecessary VirtualBranchActions struct	2024-09-06 14:12:14 +02:00
Mattias Granlund	0db82ea38c	Replace all relevant occurrences of integration with workspace	2024-09-02 20:53:19 +03:00
Mattias Granlund	5f9c2e5832	Rename gitbutler/integration -> gitbutler/workspace	2024-09-02 20:53:19 +03:00
Sebastian Thiel	a0e236110a	refactor ... - move `gix` repository extension to where it belongs more naturally. - make sure that `get_wd_tree()` is named more closely to what it really does, and use it in more places.	2024-08-28 22:05:25 +02:00
Caleb Owens	0b397d2368	Jiggle some code about	2024-08-27 13:05:28 +02:00
Caleb Owens	3fb5077c4a	Somethign somethign matchy matchy design	2024-08-27 13:05:27 +02:00
Caleb Owens	04a63f1712	Exit edit mode without saving	2024-08-23 12:47:17 +02:00
Caleb Owens	893b3fc499	Use a default variant on enum	2024-08-22 18:04:11 +02:00
Caleb Owens	ace6facb24	Getting behaviour locked in	2024-08-21 14:45:41 +02:00
Caleb Owens	65fb462d64	Rebase revolution ... Co-authored-by: Scott <schacon@gmail.com>	2024-08-19 18:10:28 +02:00
Caleb Owens	17d15719ce	Update terminology	2024-08-19 13:25:46 +02:00
Caleb Owens	dbe8013de3	Record entering edit mode in oplog	2024-08-19 11:44:59 +02:00
Caleb Owens	7ab7731a31	Add edit mode actions ... More edit mode	2024-08-19 11:03:51 +02:00