mirror of
https://github.com/gitui-org/gitui
synced 2026-05-24 09:28:21 +00:00
parent
4d4761ed21
commit
ee9ae4b2fd
6 changed files with 13 additions and 6 deletions
15
CHANGELOG.md
15
CHANGELOG.md
|
|
@ -7,15 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
|
**more info in commit popup**
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
**pull support (only ff-merge)**
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
### Breaking Change
|
### Breaking Change
|
||||||
- MacOS config directory now uses `~/.config/gitui` [[@remique](https://github.com/remique)] ([#317](https://github.com/extrawurst/gitui/issues/317))
|
- MacOS config directory now uses `~/.config/gitui` [[@remique](https://github.com/remique)] ([#317](https://github.com/extrawurst/gitui/issues/317))
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
- support smoother left/right toggle for commit details ([#418](https://github.com/extrawurst/gitui/issues/418))
|
- support for pull (fetch + ff-only merge) ([#319](https://github.com/extrawurst/gitui/issues/319))
|
||||||
- support *force push* command [[@WizardOhio24](https://github.com/WizardOhio24)] ([#274](https://github.com/extrawurst/gitui/issues/274))
|
|
||||||
- show used char count in input texts ([#466](https://github.com/extrawurst/gitui/issues/466))
|
- show used char count in input texts ([#466](https://github.com/extrawurst/gitui/issues/466))
|
||||||
|
- support smoother left/right toggle/keys for commit details ([#418](https://github.com/extrawurst/gitui/issues/418))
|
||||||

|
- support *force push* command [[@WizardOhio24](https://github.com/WizardOhio24)] ([#274](https://github.com/extrawurst/gitui/issues/274))
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- don't close branchlist every time ([#550](https://github.com/extrawurst/gitui/issues/550))
|
- don't close branchlist every time ([#550](https://github.com/extrawurst/gitui/issues/550))
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 131 KiB |
BIN
assets/chars_and_branchname.gif
Normal file
BIN
assets/chars_and_branchname.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 MiB |
BIN
assets/pull.gif
Normal file
BIN
assets/pull.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 158 KiB |
|
|
@ -185,7 +185,7 @@ impl DrawableComponent for PullComponent {
|
||||||
.block(
|
.block(
|
||||||
Block::default()
|
Block::default()
|
||||||
.title(Span::styled(
|
.title(Span::styled(
|
||||||
strings::FETCH_POPUP_MSG,
|
strings::PULL_POPUP_MSG,
|
||||||
self.theme.title(true),
|
self.theme.title(true),
|
||||||
))
|
))
|
||||||
.borders(Borders::ALL)
|
.borders(Borders::ALL)
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ pub mod order {
|
||||||
|
|
||||||
pub static PUSH_POPUP_MSG: &str = "Push";
|
pub static PUSH_POPUP_MSG: &str = "Push";
|
||||||
pub static FORCE_PUSH_POPUP_MSG: &str = "Force Push";
|
pub static FORCE_PUSH_POPUP_MSG: &str = "Force Push";
|
||||||
pub static FETCH_POPUP_MSG: &str = "Fetch";
|
pub static PULL_POPUP_MSG: &str = "Pull";
|
||||||
pub static PUSH_POPUP_PROGRESS_NONE: &str = "preparing...";
|
pub static PUSH_POPUP_PROGRESS_NONE: &str = "preparing...";
|
||||||
pub static PUSH_POPUP_STATES_ADDING: &str = "adding objects (1/3)";
|
pub static PUSH_POPUP_STATES_ADDING: &str = "adding objects (1/3)";
|
||||||
pub static PUSH_POPUP_STATES_DELTAS: &str = "deltas (2/3)";
|
pub static PUSH_POPUP_STATES_DELTAS: &str = "deltas (2/3)";
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue