Jesse Duffield
a365615490
only use subprocess for merging, not rebasing
2018-12-11 22:16:48 +11:00
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
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
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
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
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
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
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
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
32d1289af7
Merge branch 'master' into feature/fix-keybind-crash
2018-11-08 17:49:21 +11:00
mjarkk
8f0741a458
Changed the youtube link to a youtu.be short link
2018-11-03 09:19:47 +01:00
Glenn Vriesman
abd0803ef4
Set current view to limit view
2018-10-28 19:15:34 +01:00
Jesse Duffield
467775fc1c
Merge branch 'master' into master
2018-10-23 09:43:25 +11:00
Naveen Vardhi
3a23cb87b7
Remove force delete keybinding
...
And force delete messages gives feedback about merge status
2018-10-21 21:13:24 +05:30
Jesse Duffield
59cdd7d46e
Merge branch 'master' into master
2018-10-20 10:53:02 +11:00
Kristijan Husak
c69fce2e9d
Remove unnecessary nil error in NewPullRequest.
2018-10-15 11:00:19 +02:00
Kristijan Husak
df0e3e52fe
Add option to create pull request form branches panel.
2018-10-13 22:54:51 +02:00
Kristijan Husak
4287f8ae90
Fix tests and add test scenarios for amend.
2018-10-08 22:19:42 +02:00
Kristijan Husak
190309e5c1
Check if there is any commit to amend and use 'A' instead of 'M' as shortcut.
2018-10-08 21:19:45 +02:00
Jesse Duffield
ac65586bd5
Merge branch 'master' into feature/commit-amend
2018-10-07 21:08:46 +11:00
Naveen Vardhi
af8d362caa
Initial version of delete named branch added
2018-10-06 17:04:33 +05:30
Kristijan Husak
5f7ac97a39
Refresh side panels and use uppercase HEAD in all git commands that requires it.
2018-10-06 09:53:54 +02:00
Kristijan Husak
28fe3d6cf9
Use confirmation popup for amending last commit.
2018-09-25 22:11:51 +02:00
Kristijan Husak
b6b21bc98e
Merge branch 'master' of git://github.com/jesseduffield/lazygit into feature/commit-amend
2018-09-25 21:17:53 +02:00
Jesse Duffield
0d33a746ba
Merge branch 'feature/informative-commit-colors' of https://github.com/jesseduffield/lazygit into feature/informative-commit-colors
2018-09-25 20:11:36 +10:00
Jesse Duffield
f3fc98a3d0
support git flow when colouring commits
2018-09-25 20:11:33 +10:00
Jesse Duffield
17d7bcdeaf
Merge branch 'master' into feature/informative-commit-colors
2018-09-25 20:10:12 +10:00
Jesse Duffield
7164f37266
Merge branch 'master' into feature/commit-amend
2018-09-25 19:05:24 +10:00
Jesse Duffield
e9245cd53b
Merge branch 'master' into add-tests-part-7
2018-09-25 19:03:29 +10:00
Jesse Duffield
80d6bbef86
Merge branch 'master' of https://github.com/jesseduffield/lazygit
2018-09-23 14:13:14 +10:00
Jesse Duffield
3d751c03fe
add donation link to status panel
2018-09-23 14:13:10 +10:00
Jesse Duffield
7947668e18
Merge branch 'hotfix/273-cursor-scrolling' of https://github.com/jesseduffield/lazygit into hotfix/273-cursor-scrolling
2018-09-22 13:50:01 +10:00
Jesse Duffield
619c28ce56
use lineheight rather than buffer length
2018-09-22 13:49:58 +10:00
Anthony HAMON
bdeb78c9a0
commands/git : returns an error instead of panicing
2018-09-20 09:09:37 +02:00
Jesse Duffield
8fac19c175
Merge branch 'master' into feature/informative-commit-colors
2018-09-20 09:41:29 +10:00
Jesse Duffield
b9708c9f88
fix issues with commit message panel losing focus
2018-09-19 20:36:40 +10:00
Jesse Duffield
baa9eff318
Merge branch 'hotfix/cursor-positioning' into feature/recent-repos
2018-09-19 19:17:05 +10:00
Jesse Duffield
e91fb21233
add recent repos menu option
2018-09-19 19:15:29 +10:00
Jesse Duffield
99a6439641
Merge branch 'master' into hotfix/cursor-positioning
2018-09-19 18:42:25 +10:00
Jesse Duffield
768b9453f8
Merge branch 'hotfix/cursor-positioning' into feature/recent-repos
2018-09-19 18:40:41 +10:00
Jesse Duffield
c789bba673
color merged and unmerged commits differently
2018-09-18 21:45:35 +10:00
