mjarkk
6c1c110ce0
Made tests pass
...
Git constandly exits with error code 1 for some reason it might be because of the wrong username and password but i don't think error 1 is for wrong credentials
2018-10-27 15:32:12 +02:00
Mark Kopenga
45c249acca
Merge branch 'master' into https-ask-for-username-password
2018-10-27 15:06:51 +02:00
mjarkk
1df1053947
Fixed test
2018-10-27 15:01:16 +02:00
mjarkk
14cff0bd07
Fixed circleci build
2018-10-27 14:57:44 +02:00
mjarkk
87d1b9a547
Fixed circleci build
2018-10-27 14:56:15 +02:00
mjarkk
959d6fa2ca
Made it possible to build for windows again
2018-10-27 14:37:31 +02:00
mjarkk
e47c597b3a
Made it possible to build again for windows
2018-10-27 14:35:07 +02: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
Mark Kopenga
1fedda6a75
Merge branch 'master' into https-ask-for-username-password
2018-10-23 13:52:50 +02: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
mjarkk
ac03665df3
Handled some errors
2018-10-20 19:44:56 +02:00
mjarkk
1be44eae84
Fixed surgestion from golangcibot
2018-10-20 19:03:51 +02:00
mjarkk
b72841ca0c
Fixed golangcibot surgestions
2018-10-20 18:58:37 +02:00
mjarkk
12425f0aa7
First good success
2018-10-20 17:37:55 +02:00
mjarkk
727ba9f42e
test
2018-10-20 17:21:17 +02:00
mjarkk
73a0a65ee1
test
2018-10-20 17:20:52 +02:00
mjarkk
ac5696574c
added some translations
2018-10-20 17:18:42 +02:00
mjarkk
1a43d64de3
Added extra translations
2018-10-20 16:25:48 +02:00
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
mjarkk
4451cbc50b
handled golangcibot
2018-10-17 21:14:24 +02:00
mjarkk
01fa106de3
Added files to commit pannelsidjfjlisdjfilisldjfiljisldjilfjisdjilfjlsidMoved some code around
2018-10-17 21:12:33 +02:00
mjarkk
9fc4262887
small code addition
2018-10-17 20:41:22 +02:00
mjarkk
cecd5733a8
Basic file for getting the fix working
2018-10-17 20:38:13 +02: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
Jesse Duffield
d0a3f1eecf
Merge pull request #291 from antham/add-tests-part-7
...
Add tests to pkg/commands/git - Part 7
2018-09-25 19:13:35 +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