Skip to content

Commit 49316ba

Browse files
author
Stephan Dilly
committed
some readme updates
1 parent ee9ae4b commit 49316ba

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
- Inspect, commit, and amend changes (incl. hooks: _commit-msg_/_post-commit_)
3131
- Stage, unstage, revert and reset files and hunks
3232
- Stashing (save, apply, drop, and inspect)
33-
- Push to remote
33+
- Push/Fetch to/from remote
3434
- Branch List (create, rename, delete)
3535
- Browse commit log, diff committed changes
3636
- Scalable terminal UI layout
@@ -55,7 +55,7 @@ Over the last 2 years my go-to GUI tool for this was [fork](https://git-fork.com
5555

5656
# Known Limitations
5757

58-
- no support for `pull` yet (see [#90](https://github.com/extrawurst/gitui/issues/90))
58+
- no support for conflict resolution yet (see [#485](https://github.com/extrawurst/gitui/issues/485))
5959
- no support for [bare repositories](https://git-scm.com/book/en/v2/Git-on-the-Server-Getting-Git-on-a-Server) (see [#100](https://github.com/extrawurst/gitui/issues/100))
6060
- no support for [core.hooksPath](https://git-scm.com/docs/githooks) config
6161

@@ -172,7 +172,6 @@ The key bindings can be customized: See [Key Config](KEY_CONFIG.md) on how to se
172172
These are the high level goals before calling out `1.0`:
173173

174174
* upstream branches ([#453](https://github.com/extrawurst/gitui/issues/453))
175-
* simple pull (only for ff-merge) ([#319](https://github.com/extrawurst/gitui/issues/319))
176175
* merging with conflicts ([#485](https://github.com/extrawurst/gitui/issues/485))
177176
* log search (commit, author, sha) ([#449](https://github.com/extrawurst/gitui/issues/449),[#429](https://github.com/extrawurst/gitui/issues/429))
178177
* file history log ([#381](https://github.com/extrawurst/gitui/issues/381))

0 commit comments

Comments
 (0)