gitui-org/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui.git synced 2026-10-12 02:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,687 Commits 22 Branches 69 Tags
ef3ece552dc04414ee6c69b7ad41186106bbfe58
Commit Graph
89 Commits
Author SHA1 Message Date
extrawurst ef3ece552d PoC list submodules (#1090) 2022-08-27 17:55:06 +02:00
Stephan D 2a578889f3 switch focus to index after staging last file (#1170) 2022-03-10 00:50:37 +01:00
Christoph Rüßler b622ceef94 Add popup for file history (#841) 2022-01-30 18:50:50 +01:00
Stephan Dilly 132559ea7f support annotated tags (#1073) 2022-01-12 12:44:34 +01:00
Stephan Dilly d5d36de01e implement reverting commit from revlog (#1057) 2021-12-29 16:40:22 +01:00
Stephan Dilly 006cdd6373 support bare repos (#1028) 2021-12-05 00:35:45 +01:00
R0nd 153c79a828 support pull from remote (#945) 
closes #920
 2021-10-13 15:34:58 +02:00
Stephan Dilly e4c7867564 allow rebase with conflicts (#897) 2021-09-29 18:55:47 +02:00
Stephan Dilly f8bad7d541 cleanup 2021-09-29 17:07:59 +02:00
Stephan Dilly a8654329ec allow rebase of a branch (#816) 2021-08-26 20:31:37 +02:00
Stephan Dilly 7cc19f673a support options for the way we calculate the status (#849) 2021-08-19 02:19:36 +02:00
Stephan Dilly dad8e8d43d cargo fmt: use hardtabs 
since it does not support hard-whitespaces its the only way to make whitespaces consisitent and checked
 2021-08-17 14:24:25 +02:00
Stephan Dilly d42b00389c check branch name validity while typing (#842) 
closes #559
 2021-08-15 15:14:35 +02:00
Christoph Rüßler bce652ecca Add filter to AsyncLog 
This is a small change that makes it possible to reuse the logic in
`AsyncLog` for the file history view. `AsyncLog` passes the filter to
`FileLogWalker` unchanged.
 2021-06-26 13:07:03 +02:00
Stephan Dilly 6006e7aebd use new custom logwalker 2021-06-04 09:55:19 +02:00
Stephan Dilly e8c2dc25d4 simplify log walker 2021-06-03 23:55:30 +02:00
Stephan Dilly 3cd218de57 honor showUntrackedFiles config (#753) 2021-06-01 09:56:55 +02:00
Stephan Dilly 680b178a37 make revlog sorted by time 2021-05-29 15:42:17 +02:00
Christoph Rüßler 2ed6f53dcf Add popup for tags 
This closes #483.
 2021-05-27 21:02:30 +02:00
Stephan Dilly 7177bb223b change temporary commit msg file path 
we now use `.git/COMMIT_EDITMSG` for vim to recognise
 2021-05-24 10:37:58 +02:00
Stephan Dilly 5ba657cabe file tree of a commit (#715) 2021-05-18 00:21:05 +02:00
Stephan Dilly f35ce0cbf4 support doing merge commit (#701) 2021-05-12 11:20:39 +02:00
Stephan Dilly b5327a65c1 rename 2021-05-12 09:01:08 +02:00
Stephan Dilly f30ec49886 show merge head ids in merge state (#697) 2021-05-11 18:26:12 +02:00
Stephan Dilly 4f6aceb3ec merging a branch (#696) 
* merging arbitrary branch
* cleanup intermediate in-merge state
 2021-05-09 22:53:12 +02:00
Stephan Dilly 147f65562c cleanup some TODO 2021-04-27 17:51:29 +02:00
Stephan Dilly a3f7d189e5 Fix 663 msg scroll (#669) 
* fix line skipping and added unittest
 2021-04-25 14:09:53 +02:00
Christoph Rüßler e7b703b922 Improve blame view 
- Set default shortcut to `B` instead of `b` because the latter would
  shadow `[b]ranches`.
- Add scrollbar.
- Show resolved commit id in title instead of `HEAD`.
- Make commit id bold if it is the commit id the file is blamed at.
- Don’t run blame on a binary file.
- Add shortcut for inspecting a commit in blame view.
 2021-04-24 14:02:51 +02:00
Christoph Rüßler b7eed4361e Add blame view 
This closes #484.
 2021-04-21 15:03:37 +02:00
brunohgouveia 79a38a70b9 Add pop stash command on Staches tab 2021-04-11 13:17:26 +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 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 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 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
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 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
Richard Menzies 6c974ee1d3 Support force push (#421) 2021-02-23 11:02:16 +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 c4fdbf7aba make sync part of lib expect safe 2020-11-01 12:49:11 +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
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