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
Glenn Vriesman
9a0f094f58
Changed some things after marks feedback
2018-10-28 20:33:42 +01:00
Glenn Vriesman
ee89ad6ae7
Fixed test
2018-10-28 20:13:55 +01:00
Glenn Vriesman
22e5aafd59
Fixed and added some dutch translations
2018-10-28 19:58:20 +01:00
Glenn Vriesman
abd0803ef4
Set current view to limit view
2018-10-28 19:15:34 +01:00
Daniel Bast
bfcb348923
Add conda to readme as possibility to install on different platforms
2018-10-25 09:54:01 +02:00
Jesse Duffield
c6da4c8a47
Merge pull request #301 from rozuur/master
...
Initial version of delete named branch added
2018-10-24 09:24:16 +11:00
Jesse Duffield
467775fc1c
Merge branch 'master' into master
2018-10-23 09:43:25 +11:00
Jesse Duffield
3b6b68a2a1
Merge pull request #305 from kristijanhusak/feature/create-pull-request
...
Add option to create pull request from branches panel.
2018-10-22 11:51:16 +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
Kristijan Husak
990dc8c4ea
Add separate open command for links and check if branch exists on remote before opening pull request link.
2018-10-20 11:58:08 +02:00
Jesse Duffield
59cdd7d46e
Merge branch 'master' into master
2018-10-20 10:53:02 +11:00
Mark Kopenga
1d733f3adc
Merge pull request #13 from jesseduffield/master
...
Updated to latest master
2018-10-17 20:22:41 +02: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
Jesse Duffield
d5f64602a8
Merge pull request #283 from kristijanhusak/feature/commit-amend
...
Add action for amending a commit
2018-10-10 17:50:55 +11: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
Jesse Duffield
b8b59baa27
Merge pull request #290 from jesseduffield/feature/informative-commit-colors
...
Color merged and unmerged commits differently
2018-10-05 09:37:55 +10:00
Jesse Duffield
2be613679e
more test coverage
2018-10-05 09:11:19 +10: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
eb69d98f99
add test for CurrentBranchName
2018-09-25 20:31:19 +10:00
Jesse Duffield
fb9596a3ff
add test for getMergeBase
2018-09-25 20:25:04 +10: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
