Commit Graph

15 Commits

Author SHA1 Message Date
Abdelilah El Aissaoui
c0c07ef5b1 Added conflict indicator during merge in uncommited changes 2022-01-02 01:46:23 +01:00
Abdelilah El Aissaoui
ad55f41f58 Fixed unstage hunk not working properly when having context lines inbetween changes 2021-12-28 02:01:08 +01:00
Abdelilah El Aissaoui
2e157aa773 Added try catch that unlocks the dir cache in case of error in hunk unstage 2021-12-28 01:37:21 +01:00
Abdelilah El Aissaoui
a8ed01784d Implemented stage/unstage by hunks 2021-12-28 01:19:29 +01:00
Abdelilah El Aissaoui
908696735b Added error display when a push has failed 2021-12-21 02:26:52 +01:00
Abdelilah El Aissaoui
3ed5f0cc1e Uncommited changes line now show if merging/rebasing
This commit starts not only the rebase support but also manage merges when conflicts appear [WIP]
2021-12-18 04:18:48 +01:00
Abdelilah El Aissaoui
1943bd6906 Fixed crashes when opening an empty repository 2021-12-18 02:23:39 +01:00
Abdelilah El Aissaoui
31b692e581 Reformated project's code 2021-12-12 19:49:46 +01:00
Abdelilah El Aissaoui
2a43cdeca8 Disabled allowing empty git commits 2021-12-06 23:05:06 +01:00
Abdelilah El Aissaoui
ca3a55ce21 Added status update when file system changes (excluding ignored dirs) 2021-11-28 03:15:18 +01:00
Abdelilah El Aissaoui
da3f3c8935 Added password for ssh keys 2021-11-05 04:27:35 +01:00
Abdelilah El Aissaoui
87d7f1cdae Added new log tree 2021-10-15 01:09:25 +02:00
Abdelilah El Aissaoui
ee745bd4e0 Added un/stage all buttons 2021-10-10 02:59:26 +02:00
Abdelilah El Aissaoui
2b3c12e20d Migrated project to use Dagger 2021-10-06 20:45:33 +02:00
Abdelilah El Aissaoui
642cfd5f1e Added dagger dependencies and moved code to package to avoid kapt warnings 2021-10-06 19:05:07 +02:00