Commit graph

985 commits

Author SHA1 Message Date
Jesse Duffield 9489a94473 Make merge panel its own panel 2018-12-11 22:02:12 +11:00
Jesse Duffield e0ff46fe53 more work on rebasing including visual indicators 2018-12-11 09:39:54 +11:00
Glenn Vriesman cce6f405a5 Making ci happier 2018-12-11 09:39:54 +11:00
Glenn Vriesman e39d2ed44b Added check to invoke continue/refresh 2018-12-11 09:39:54 +11:00
Glenn Vriesman 7a7e885773 Added rebase support commands 2018-12-11 09:39:54 +11:00
Glenn Vriesman 34fd18a395 Error handling 2018-12-11 09:39:54 +11:00
Glenn Vriesman a1ee11e54e Added error check to satisfy ci 2018-12-11 09:39:54 +11:00
Glenn Vriesman 7b850c56c4 Added some translations 2018-12-11 09:39:54 +11:00
Glenn Vriesman 88c01c1ded Added rebase keybinding 2018-12-11 09:39:54 +11:00
Glenn Vriesman 27994f7de8 Added rebase handler 2018-12-11 09:39:54 +11:00
Glenn Vriesman 670f0e37c7 Added rebase functions 2018-12-11 09:39:54 +11:00
Glenn Vriesman 822dc5dada Moved push-pullables status to the end 2018-12-11 09:38:33 +11:00
Tommy Nguyen b95abd95ef Dockerfile: add alias 2018-12-09 16:36:12 +11:00
Tommy Nguyen ea6712dec8 Remove -a -installsuffix; copy to /bin/ 2018-12-09 16:36:12 +11:00
Tommy Nguyen de37a66ef3 Dockerfile improvements 2018-12-09 16:36:12 +11:00
Jesse Duffield ff856b7630 fetching branches without checking out 2018-12-08 11:51:47 +11:00
Jesse Duffield ca3afa2a39 standardising how list panels deal with cursor movement 2018-12-08 11:51:47 +11:00
Jesse Duffield 99a8b1ae8b making a start on unidirectional data binding to fix these UI bugs 2018-12-08 11:51:47 +11:00
Jesse Duffield ccc771d8b1
Merge pull request #342 from jesseduffield/hotfix/faster-reset-hard-head
Faster reset --hard head and clean as well
2018-12-08 10:04:27 +11:00
Jesse Duffield 3b51d7cd00 clean as well as reset (I'm hoping this is a good design decision) 2018-12-05 20:06:47 +11:00
Jesse Duffield 66512ca253 use porcelain git rather than go-git for reset --hard HEAD because go-git takes over 5 seconds 2018-12-05 19:49:07 +11:00
Jesse Duffield 1a6a69a8f1
You can now stage changes one line at a time
Staging Lines
2018-12-05 19:40:22 +11:00
Jesse Duffield 933874fb25 dutch and polish translations to be updated 2018-12-05 19:33:54 +11:00
Jesse Duffield c0f9795910 staging lines and hunks 2018-12-05 19:33:46 +11:00
Jesse Duffield 658e5a9faf initial support for staging individual lines 2018-12-04 22:11:48 +11:00
Jesse Duffield 99824c8a7b add patch modifier struct 2018-12-04 22:11:48 +11:00
Jesse Duffield 60060551bf
Merge pull request #336 from BlakeMScurr/auto-fix-function-comments
Fix function comments with CodeLingo.
2018-12-03 09:33:42 +11:00
BlakeMScurr 181f91d2ef Add full stops to new comments. 2018-11-30 13:47:14 +13:00
BlakeMScurr 643cdd3461 Add simple comments to uncommented functions. 2018-11-30 11:04:08 +13:00
BlakeMScurr 5c70d2724b Fix function comments with CodeLingo. 2018-11-28 15:31:22 +13:00
Jesse Duffield 55712f509c
Merge pull request #333 from jirfag/master
fix 'main' redefinition in scripts/ dir
2018-11-26 19:54:08 +11:00
Denis Isaev 4e8e4612bd
fix 'main' redefinition in scripts/ dir 2018-11-24 12:23:46 +03:00
Jesse Duffield b9ecb82cb7
Merge pull request #328 from jesseduffield/feature/detached-heads
support Detached heads
2018-11-14 22:07:33 +11:00
Jesse Duffield 5160668efd
Merge branch 'master' into feature/detached-heads 2018-11-14 21:23:44 +11:00
Jesse Duffield 0eb1e4a86b change how we build our list of branches to support detached heads 2018-11-14 21:19:12 +11:00
Jesse Duffield cc7d78f1ee
Merge pull request #315 from glvr182/feature/translations
Fixed and added some dutch translations
2018-11-14 20:50:08 +11:00
Jesse Duffield b8d5adcb84
Merge branch 'master' into feature/translations 2018-11-14 19:35:51 +11:00
Jesse Duffield a5f483fae9 refactor obtaining current branch name 2018-11-14 19:08:42 +11:00
Jesse Duffield 775d910bdc
Merge pull request #326 from KOREAN139/master
add scroll-past-bottom configuration option
2018-11-14 18:49:21 +11:00
KOREAN139 9d79d32c94 add scroll-past-bottom configuration option
with gui.scrollPastBottom option true, lazygit let user scroll past the
bottom - which is default
if option is false, user cannot scroll further when bottom of file has
appeared in mainView
2018-11-08 19:35:05 +09:00
Jesse Duffield 79ef98739d
Merge branch 'master' into feature/translations 2018-11-08 17:57:01 +11:00
Jesse Duffield c2eaeab1f0
Merge pull request #314 from glvr182/feature/fix-keybind-crash
Fix bug related to limit view
2018-11-08 17:55:54 +11:00
Jesse Duffield 32d1289af7
Merge branch 'master' into feature/fix-keybind-crash 2018-11-08 17:49:21 +11:00
Jesse Duffield ea55643cb2
Merge branch 'master' into feature/translations 2018-11-08 17:47:00 +11:00
Jesse Duffield dcb6216713
Merge pull request #319 from mjarkk/fix-yt-link
Change the youtube video tutorial link to a short youtu.be link
2018-11-08 17:46:15 +11:00
mjarkk 8f0741a458 Changed the youtube link to a youtu.be short link 2018-11-03 09:19:47 +01:00
Mark Kopenga 6f2b62f729
Merge pull request #15 from jesseduffield/master
Update to latest master
2018-11-03 09:17:43 +01:00
Glenn Vriesman d33f89fd60
Merge branch 'master' into feature/fix-keybind-crash 2018-10-31 15:04:34 +01:00
Glenn Vriesman c0da212f54
Merge branch 'master' into feature/translations 2018-10-31 15:04:17 +01:00
Jesse Duffield bf45e5b0e3
Merge pull request #313 from dbast/master
Add conda to readme as possibility to install on different platforms
2018-10-29 16:11:27 +11:00