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
1094 commits 22 branches 69 tags 87 MiB
Commit graph

198 commits

Author SHA1 Message Date
Stephan Dilly
bfa240115c
support rebase merge (conflict free only) (#567) 2021-03-11 11:49:04 +01:00
Stephan Dilly
b5ef9b10f1
Stage/unstage lines (#575) 2021-03-10 22:27:02 +01:00
Stephan Dilly
25198101f2 cleanup 2021-03-10 15:44:42 +01:00
Stephan Dilly
c79b3d74fa
Fix 576 stash apply conflicts (#578) 
* unittest that applying with conflicts errors out and prepare for stash apply to allow creating conflicts for later
* mark conflicting items
 2021-03-09 14:14:16 +01:00
Stephan Dilly
6e5db96c19
support discard selected lines (#571) 2021-03-08 18:00:30 +01:00
Stephan Dilly
f1fcd341c6
add support for pushing tags (#569) 2021-03-05 17:49:40 +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
4d4761ed21
fix fetch notifications (#555) 
* fix fetch notifications
* actually show fetch transfer progress
* reduce sleep because it significantly slows down fetching
 2021-03-01 12:32:39 +01:00
Stephan Dilly
67f3a13716
only show non-clean repo states (#553) 
* only show repo state if not clean
 2021-03-01 00:12:09 +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
Stephan Dilly
c1565eb000 nightly clippy fixes 2021-02-27 18:16:38 +01:00
Stephan Dilly
8d4c1ca26e
don't close branchlist every time (#550) 
* do not close branchlist after branch rename 
* do not close branchlist after deleting a branch
* closes #543
 2021-02-25 15:54:18 +01:00
Stephan Dilly
06622008da fix regression in async diff (introduced in 546c7f3) 2021-02-24 22:15:10 +01:00
Stephan Dilly
546c7f3072
fix some potentials for errors to bubble up (#547) 
* fix some potentials for errors to bubble up (#490)
* fix async diff failing panic
 2021-02-24 21:54:27 +01:00
Stephan Dilly
59acccc484 split up stuff into new remote mod 2021-02-24 11:32:38 +01:00
Stephan Dilly
a53ec16161
prefer 'origin' as default remote if it exists (#544) 
closes #494
 2021-02-24 11:04:01 +01:00
Stephan Dilly
5cf9986df9
actually commit the temp files for flaky/failing unittest (#535) 
* actually commit the temp files (#534)
* make check for commit id more explicit
* fix last assert checking against wrong id
 2021-02-23 15:04:40 +01:00
Stephan Dilly
5f9f87746e ignore flaky randomly failing test 2021-02-23 12:12:55 +01:00
Richard Menzies
6c974ee1d3
Support force push (#421) 2021-02-23 11:02:16 +01:00
Richard Menzies
301a3a1b87
Fix build (#525) 2021-02-23 10:59:10 +01:00
Stephan Dilly
be3a33e862 fix formating for rust 1.50 2021-02-11 17:56:04 +01:00
Christoph Rüßler
fe0c2f558c
Use get_entry instead of get_str (#269) 2021-02-04 19:22:08 +01:00
Stephan Dilly
02990204e1 fix crash when no remote called 'origin' present (#486) 2021-01-12 16:17:14 +01:00
Stephan Dilly
b63063271d cleanup nightly clippy warnings 2021-01-08 11:55:50 +01:00
Stephan Dilly
2b7d7f467b
Set tracking branch on push (#452) 
set upstream on each push (if not already defined). closes #275
 2020-12-20 16:48:47 +01:00
Stephan Dilly
44ba5a83c9
show branch ahead/behind only if upstream is set (#451) 
closes #385
 2020-12-20 16:01:04 +01:00
Stephan Dilly
7174817777 clippy nightly complaint 2020-12-08 00:51:41 +01:00
pm100
a6bce24d72
fix core-editor ignored (#414) (#419) 2020-12-08 00:18:51 +01:00
Richard Menzies
ac2c0624db Change he and his to they and their 2020-11-14 01:11:23 +01:00
Richard Menzies
f74abfb685 Fix clippy error 2020-11-07 13:07:31 +01:00
Stephan Dilly
88813381da indicate if branch has an upstream and some cleanup 2020-11-01 19:43:19 +01:00
Stephan Dilly
c4fdbf7aba make sync part of lib expect safe 2020-11-01 12:49:11 +01:00
Stephan Dilly
00073cbdd7 fix hook panicking (#393) 2020-11-01 12:46:59 +01:00
Stephan Dilly
6e6832da21 cleanup one more expect 2020-11-01 12:37:07 +01:00
Stephan Dilly
2dab9de273 cleanup some more expects 2020-11-01 12:16:40 +01:00
Stephan Dilly
632f255548 cleanup some more expects 2020-11-01 02:11:55 +01:00
pm100
99c3277e94
adding pre-commit hook (#386) 
see #313
 2020-11-01 01:06:48 +01:00
Stephan Dilly
4ee4432f16
visualize outgoing/incoming changes (#364) 2020-10-25 17:35:54 +01:00
Stephan Dilly
a2b26c30dc little cleanups 2020-10-25 15:43:13 +01:00
Arnaud
9439114e5f
feat: support https push (#353) 2020-10-25 10:50:20 +01:00
Richard Menzies
71880f96f7
Rename branch (#334) 2020-10-17 09:00:34 +02:00
Richard Menzies
b6c932d0af
Delete branch (#332) 2020-10-11 14:30:44 +02:00
Stephan Dilly
1f55c18945 add unittests for checkout 2020-10-11 13:22:45 +02:00
Stephan Dilly
7e33047232 more idiomatic way 2020-10-11 13:22:45 +02:00
Stephan Dilly
5966c05690 add unittests for get_branches_to_display 2020-10-11 13:22:45 +02:00
Stephan Dilly
06aeca59d2
Branchlist fixes (#320) 
* changelog and some cleanup
 2020-10-10 01:43:57 +02:00
Richard Menzies
94bbf3c9fb
Branch popup (#303) 
closes #91
 2020-10-10 01:27:13 +02:00
Stephan Dilly
92b1b4c2a8 dont allow unused imports 2020-10-09 15:31:51 +02:00