Commit Graph

19 Commits

Author SHA1 Message Date
Abdelilah El Aissaoui
ac21b59f6c Implemented amend previous commit 2022-02-05 03:01:03 +01:00
Abdelilah El Aissaoui
a3ff073b54 Fixed project's formatting 2022-02-02 00:26:46 +01:00
Abdelilah El Aissaoui
42fec7c591 Implemented merge & rebase 2022-01-31 01:30:25 +01:00
Abdelilah El Aissaoui
9c53ce726e Creation of multiple viewmodels that hold data state 2022-01-03 21:39:53 +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
cd19a62ae9 Fixed checking out remote branch doesn't preserve the starting point 2021-12-14 13:33:25 +01:00
Abdelilah El Aissaoui
31b692e581 Reformated project's code 2021-12-12 19:49:46 +01:00
Abdelilah El Aissaoui
6c1dc32928 Log full cleanup
- Refactored log function into multiple sub functions
- Removed use of DialogManager from Log
- Merge branch now shows current branch instead of hardcoded "HEAD"
2021-12-04 07:02:40 +01:00
Abdelilah El Aissaoui
03201972e7 Checking out a remote branch create now a local branch with the same name 2021-11-19 03:36:23 +01:00
Abdelilah El Aissaoui
67f1135b85 Added reset branch feature 2021-10-28 04:28:37 +02:00
Abdelilah El Aissaoui
d60b1a14a2 Added revert commit feature 2021-10-27 03:57:15 +02:00
Abdelilah El Aissaoui
d4d057c291 Added context menu to branches/tags & moved code to their correct managers 2021-10-27 03:45:22 +02:00
Abdelilah El Aissaoui
414bce560f Added context menu to log and added tag creation 2021-10-27 03:23:06 +02:00
Abdelilah El Aissaoui
0547c2fe9a Changed max commits loaded in the log to 1000 2021-10-15 03:02:57 +02:00
Abdelilah El Aissaoui
87d7f1cdae Added new log tree 2021-10-15 01:09:25 +02:00
Abdelilah El Aissaoui
6d0f621bcd Added new log graph 2021-10-08 22:57:18 +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