Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-24 09:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1357 commits 22 branches 69 tags 87 MiB
Commit graph

19 commits

Author SHA1 Message Date
Stephan Dilly
65524edf0b allow walking repo including all available refs 2021-05-30 12:03:03 +02:00
Stephan Dilly
680b178a37 make revlog sorted by time 2021-05-29 15:42:17 +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
f0a367c3f5
more linting (#647) 2021-04-17 23:17:19 +02:00
Stephan Dilly
53b2c79877
even more clippy restrtictions (#646) 
* even more clippy restrtictions
 2021-04-17 18:55:59 +02:00
Stephan Dilly
ee5b9d9f4e
Fix exit on fetching a branch that has no upstream/remote (#638) 
* do not assume remote/upstream of a branch anymore
 2021-04-12 16:47:08 +02:00
Stephan Dilly
b5f1e76455
Remote branches (#618) 
* allow checking out remote branch
* set tracking branch on checking out remote
* fix unittests by making branch list stable sorted by name
 2021-04-06 18:16:08 +02:00
Stephan Dilly
a2ca58a3f6
use branches upstream remote if it is already tracked (#598) 
closes #597
 2021-03-20 18:47:53 +01:00
Stephan Dilly
e9b296ac62 add remote name per branch 2021-03-20 17:58:03 +01:00
Stephan Dilly
e08f357f57 nightly clippy fix 2021-03-12 13:37:05 +01:00
Stephan Dilly
18c31dc6e0 unittest to make sure rebase merge multiple commits also works 2021-03-12 12:12:14 +01:00
Stephan Dilly
6430484a97 fix detached head after rebase merge 2021-03-12 12:04:37 +01:00
Stephan Dilly
bfa240115c
support rebase merge (conflict free only) (#567) 2021-03-11 11:49:04 +01:00
Stephan Dilly
6e5db96c19
support discard selected lines (#571) 2021-03-08 18:00:30 +01:00
Stephan Dilly
51c9085d7c
user confirm merge (#565) 2021-03-03 22:06:41 +01:00
Stephan Dilly
1714fbad49
support conflict-free merge-commit (#561) 
* support conflict-free merge-commit
 2021-03-02 12:49:12 +01:00
Stephan Dilly
39fb65b396
Async fetch (#552) 
* async fetch
* reuse remote progress for fetch
* prvent push/fetch popup from closing too soon
 2021-02-28 19:24:05 +01:00
Stephan Dilly
c96feb0fe6
branch merge from upstream (#384) 
* better structure of all branch functions
* support and unittest fast forward merge
 2021-02-28 01:55:35 +01:00