ser-drephs
|
64acf1c13b
|
docs: adds windows log file location to readme
|
2021-03-10 17:31:41 +01:00 |
|
Stephan Dilly
|
25198101f2
|
cleanup
|
2021-03-10 15:44:42 +01:00 |
|
Stephan Dilly
|
9fed464f99
|
changelog
|
2021-03-09 14:22:21 +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
|
cfd5c6ad03
|
update license
|
2021-03-09 11:36:54 +01:00 |
|
Stephan Dilly
|
6e5db96c19
|
support discard selected lines (#571)
|
2021-03-08 18:00:30 +01:00 |
|
dependabot-preview[bot]
|
f86faf6406
|
Bump serde from 1.0.123 to 1.0.124
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.123 to 1.0.124.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.123...v1.0.124)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-03-08 17:18:51 +01:00 |
|
Stephan Dilly
|
dcfdc42003
|
cleanup
|
2021-03-08 01:51:55 +01:00 |
|
Stephan Dilly
|
f1fcd341c6
|
add support for pushing tags (#569)
|
2021-03-05 17:49:40 +01:00 |
|
Stephan Dilly
|
0d9a973e79
|
fix pull popup not closing after nothing arrived
|
2021-03-04 16:08:23 +01:00 |
|
Stephan Dilly
|
50e3ab44e0
|
rc postfix breaks wix
|
2021-03-04 16:06:53 +01:00 |
|
Stephan Dilly
|
dd74739252
|
simplify dependency
|
2021-03-03 22:31:41 +01:00 |
|
Stephan Dilly
|
f84f6f458f
|
bump version
|
2021-03-03 22:13:06 +01:00 |
|
Stephan Dilly
|
9d3fafaf00
|
cleanup
|
2021-03-03 22:12:05 +01:00 |
|
Stephan Dilly
|
51c9085d7c
|
user confirm merge (#565)
|
2021-03-03 22:06:41 +01:00 |
|
Stephan Dilly
|
d1095c35ba
|
Merge 'master' from git@github.com:extrawurst/gitui.git
|
2021-03-03 19:17:39 +01:00 |
|
Stephan Dilly
|
99f5305fb7
|
cargo update
|
2021-03-03 19:16:59 +01:00 |
|
Stephan Dilly
|
36c124f9e3
|
refresh compare state at the right time (#564)
|
2021-03-03 18:40:00 +01:00 |
|
Stephan Dilly
|
a427874137
|
update changelog and readme
|
2021-03-02 12:52:02 +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
|
bead96db08
|
workaround for rust nightly clippy bug
|
2021-03-02 09:23:34 +01:00 |
|
Stephan Dilly
|
7de5265d5d
|
clippy fixes
|
2021-03-02 00:21:16 +01:00 |
|
ImgBotApp
|
914cc86453
|
[ImgBot] Optimize images
*Total -- 1,483.02kb -> 115.83kb (92.19%)
/assets/chars_and_branchname.gif -- 1,324.54kb -> 97.60kb (92.63%)
/assets/pull.gif -- 158.47kb -> 18.23kb (88.5%)
Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
|
2021-03-01 14:36:28 +01:00 |
|
Stephan Dilly
|
4126de0ec7
|
rename
|
2021-03-01 14:36:09 +01:00 |
|
Stephan Dilly
|
26d63a37a0
|
show progress in spinner when push/pull is ongoing
|
2021-03-01 14:35:37 +01:00 |
|
Stephan Dilly
|
49316baf86
|
some readme updates
|
2021-03-01 14:31:34 +01:00 |
|
Stephan Dilly
|
ee9ae4b2fd
|
changelog update (#556)
+ small renaming
|
2021-03-01 14:20:47 +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
|
dfa4d7789d
|
only even try to ff merge when there is something incoming (#554)
* Update pull.rs
|
2021-03-01 11:10:25 +01:00 |
|
Stephan Dilly
|
102b0b31fb
|
file rename
|
2021-03-01 09:51:15 +01:00 |
|
Stephan Dilly
|
a8690e6e24
|
rename
|
2021-03-01 09:49:17 +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
|
fa93594f03
|
cargo update
|
2021-02-28 23:42:11 +01:00 |
|
Stephan Dilly
|
f8305f3f3c
|
fix vim keys
|
2021-02-28 23:42:01 +01:00 |
|
Stephan Dilly
|
97f88a2f2f
|
rename
|
2021-02-28 19:34:45 +01:00 |
|
Stephan Dilly
|
bd54b47d19
|
rename fetch to pull
|
2021-02-28 19:25:16 +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
|
4b107be7be
|
make use of clippy config
|
2021-02-27 17:49:22 +01:00 |
|
Antonio Yang
|
754e88087c
|
Update Readme (#551)
|
2021-02-25 17:31:36 +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
|
dc3775caa2
|
mark breaking change more clearly
|
2021-02-25 15:11:42 +01:00 |
|
Stephan Dilly
|
e948ca850e
|
added changelog
see #549
|
2021-02-25 15:09:13 +01:00 |
|
Antonio Yang
|
7b94358d11
|
Fix vim default config (#549)
|
2021-02-25 14:59:45 +01:00 |
|
Stephan Dilly
|
06622008da
|
fix regression in async diff (introduced in 546c7f3)
|
2021-02-24 22:15:10 +01:00 |
|
Stephan Dilly
|
6482c81382
|
support left arrow to go back grom commit details (closes #418)
|
2021-02-24 22:12:23 +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
|
4a0e671197
|
cleanup changelog
|
2021-02-24 11:40:28 +01:00 |
|
Stephan Dilly
|
bde8eb8a7b
|
Revert "Support mouse scrolling (#306)"
This reverts commit 457f644f30.
|
2021-02-24 11:38:30 +01:00 |
|