utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-14 09:36:24 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1481 commits 64 branches 248 tags 205 MiB
Commit graph

788 commits

Author SHA1 Message Date
Jesse Duffield 43e5c042a2 prompt user to git init when outside a repo 2019-03-16 11:38:16 +11:00
Jesse Duffield 39844ffef9 allow a LOG_LEVEL env var to be set 2019-03-16 10:52:30 +11:00
Jesse Duffield f5c8aac97d add two more tests 2019-03-16 10:20:27 +11:00
Jesse Duffield b6447ebdbb allow adding a file viewed from the commit files panel 2019-03-16 10:20:27 +11:00
Jesse Duffield 466fc4227e fix tests 2019-03-16 10:20:27 +11:00
Jesse Duffield c034c88be4 display test name when running tests 2019-03-16 10:20:27 +11:00
Jesse Duffield 72830efc45 add some tests 2019-03-16 10:20:27 +11:00
Jesse Duffield c98eddc185 appease golangci 2019-03-16 10:20:27 +11:00
Jesse Duffield 3b2353b5ae remove redundant call to refreshCommitFilesView 
We already call this function inside the refreshCommitsView function.
We call it there because it's logical that A) one occurs whenever the other does and
B) the commit files only get refreshed after we've updated the commits themselves
 2019-03-16 10:20:27 +11:00
Jesse Duffield 3f567c952c i18n for error message about a feature being disabled for GPG users 2019-03-16 10:20:27 +11:00
Jesse Duffield 4f7f6a073c allow user to discard old file changes for a given commit 2019-03-16 10:20:27 +11:00
Jesse Duffield 0e008cc15f allow user to checkout old files 2019-03-16 10:20:27 +11:00
Jesse Duffield 1ad9c6faac minor cleanup 2019-03-16 10:20:27 +11:00
skanehira 06fe726ee7 Add feature of display committed file list #383 2019-03-16 10:20:27 +11:00
Jesse Duffield ac5088eee6 allow both enter and space to execute menu item 2019-03-03 23:18:28 +11:00
Jesse Duffield e36899d5c5 prevent crashes when scrolling up 2019-03-03 23:08:07 +11:00
Jesse Duffield a5d27764cd support user configuring mouse events to be enabled 2019-03-03 16:15:20 +11:00
Jesse Duffield 43758cbb5f i18n for rebase loading states 2019-03-03 16:11:20 +11:00
Jesse Duffield 0079015102 distinguish between inline and non-inline merge conflicts 2019-03-03 15:58:01 +11:00
Jesse Duffield 7a2176f479 acknowledge 'DU' statuses as being merge conflicts 2019-03-03 15:48:16 +11:00
Jesse Duffield e0bdfad63a don't crash if we have no lines to stage 2019-03-03 15:48:01 +11:00
Jesse Duffield f07fc31f8b fixup layout issue that was causing crashes when the window was too small 2019-03-03 15:34:53 +11:00
Jesse Duffield 4bb577ab7d show loading status for rebasing events 2019-03-03 15:21:33 +11:00
Jesse Duffield 8305d8e72f hide donate button if mouse events are disabled 2019-03-03 15:21:20 +11:00
Jesse Duffield 8925b161a7 windows support for skipping the editor 2019-03-03 12:44:10 +11:00
Jesse Duffield 273678f081 fix issue where you couldn't rearrange commits while rebasing onto a branch 2019-03-02 21:31:48 +11:00
Jesse Duffield 790235f64b add another match on the error message to tell us we've encountered merge conflicts 2019-03-02 21:31:48 +11:00
Jesse Duffield ab81f27fc7 don't show stack trace if lazygit is started outside of a git repo 2019-03-02 21:31:48 +11:00
Jesse Duffield dbb01b028d populate dutch and polish i18n files with new messages 2019-03-02 21:31:48 +11:00
Jesse Duffield 0c886eddfb Revert "remove old rebase code now that we're only ever interactively rebasing" 
This reverts commit 1a19b1412d.
 2019-03-02 20:00:26 +11:00
Jesse Duffield 399346c2ee disable mouse feature until its ready 2019-03-02 20:00:17 +11:00
Jesse Duffield 7a170bbccf extend cheatsheet generator to contain context based keybindings 2019-03-02 19:05:21 +11:00
Jesse Duffield Duffield 8c0ea8f45f mouse support 2019-03-02 17:49:30 +11:00
Jesse Duffield afbc028ad6 revert to the old keybinding for stash: I don't want anybody accidentally deleting changes they are trying to stash 2019-03-02 17:46:56 +11:00
Jesse Duffield e331dfcaf8 update i18n 2019-03-02 17:46:56 +11:00
Jesse Duffield 1337f6e76a appease golangci 2019-03-02 17:45:53 +11:00
Jesse Duffield 4de31da4be fix up tests 
This fixes up some git and oscommand tests, and pulls some tests into commit_list_builder_test.go

I've also made the NewDummyBlah functions public so that I didn't need to duplicate them across packages
I've also given OSCommand a SetCommand() method for setting the command on the struct
I've also created a file utils.go in the test package for creating convient 'CommandSwapper's, which
basically enable you to assert a sequence of commands on the command line, and swap each one out for
a different one to actually be executed
 2019-03-02 13:39:09 +11:00
Jesse Duffield Duffield 23c51ba708 cleanup 2019-02-24 18:34:18 +11:00
Jesse Duffield Duffield f4938deaae change type of cherryPickedCommits from []string to []*Commit 2019-02-24 17:34:19 +11:00
Jesse Duffield Duffield 639df512f3 decolorise strings before calculating padwidths 2019-02-24 17:05:17 +11:00
Jesse Duffield Duffield a8858cbd12 support cherry picking commits 2019-02-24 13:51:52 +11:00
Jesse Duffield Duffield 1a19b1412d remove old rebase code now that we're only ever interactively rebasing 2019-02-24 11:03:14 +11:00
Jesse Duffield Duffield 95d451e59a Make it easier to run sync/async commands, switch to interactive rebase when rebasing on branches 2019-02-24 10:58:15 +11:00
Jesse Duffield 6c1d2d45ef some i18n and restricting rewording during interactive rebase 2019-02-24 09:42:35 +11:00
Jesse Duffield f6b3a9b184 rearranging todo items while interactively rebasing 2019-02-24 09:42:34 +11:00
Jesse Duffield cdc50e8557 more support for files with spaces 2019-02-24 09:42:34 +11:00
Jesse Duffield 0173fdb9df support file renames 2019-02-24 09:42:32 +11:00
Jesse Duffield 9661ea04f3 wrap amend command in a confirmation 2019-02-20 19:46:27 +11:00
Jesse Duffield 0228e25084 work towards more interactive rebase options 2019-02-19 23:36:36 +11:00
Jesse Duffield 935f774834 don't autostash when editing 2019-02-19 09:34:24 +11:00
Jesse Duffield dcc7855fd0 pull commit list builder functions into their own builder struct 2019-02-19 09:18:30 +11:00
Jesse Duffield a8e22ed82f show interactive rebase commits that are yet to go 2019-02-19 09:03:29 +11:00
Jesse Duffield d44638130c add various interactive rebase commands 2019-02-18 23:27:54 +11:00
Jesse Duffield 76a27f417f rename any commit 2019-02-18 21:29:43 +11:00
Jesse Duffield adc2529019 dealing better with errors at the top level 2019-02-18 19:42:23 +11:00
Jesse Duffield 43ab7318d3 remove HasMergeConflicts struct instance variables 2019-02-18 19:28:02 +11:00
Jesse Duffield cb372d469f fix golangci errors 2019-02-16 21:30:29 +11:00
Jesse Duffield 88ba6efdd5
remove outdated TODO 2019-02-16 21:20:10 +11:00
Jesse Duffield e011e9bc42 more work on rebasing feature 2019-02-16 21:01:17 +11:00
Jesse Duffield ad93b4c863 consider whether the view has focus when rendering the contents of a view 2019-02-16 15:17:44 +11:00
Jesse Duffield 198cbee498 introduce panel contexts and more work on rebasing 2019-02-16 12:07:27 +11:00
Jesse Duffield daca07eaca add loading panel 2019-02-16 12:03:22 +11:00
Jesse Duffield d967f65329 fix git tests 2019-02-16 11:24:47 +11:00
Jesse Duffield c101993405 post-merge cleanup 2019-02-11 22:47:14 +11:00
Jesse Duffield 6430ab6ac9 Merge branch 'master' into feature/rebasing 2019-02-11 22:46:27 +11:00
Jesse Duffield cfe3605e6b use go-errors package to display stacktrace of errors that cause panics 2019-02-11 22:39:17 +11:00
Jesse Duffield 75ab8ec4d9 catch rebase errors and show in error panels 2019-02-11 21:29:47 +11:00
Jesse Duffield 77faf85cfc post-merge cleanup 2019-02-11 21:07:12 +11:00
Jesse Duffield 3d343e9b57 Merge branch 'master' into feature/rebasing 2019-02-11 21:02:53 +11:00
Jesse Duffield 3a607061a2 Only reset origin in main view when handling the selection of a new file 2019-01-18 09:32:15 +11:00
Jesse Duffield 695b092c41 Directly send wrap argument rather than the view 2019-01-17 10:29:52 +11:00
Jesse Duffield a38d1a3b68 Explicitly refer confirmation panel view 
as @jesseduffield pointed in #358, need to refer
confirmation panel view explicitly in case something
else has focus

Co-Authored-By: KOREAN139 <korean139@gmail.com>
 2019-01-17 10:29:52 +11:00
KOREAN139 2dc5e6d503 Fix recent repo view size issue 
getMessageHeight() calculates height under assumption that given view's
wrap option (view.Wrap) is true, and createMenu() does not set wrap
option as true. this causes gocui set improper view's height when lines
in view needs to be wrapped.
add *gocui.View as parameter in getMessageHeight(), and calculates
view's height depend on its wrap option.

resolve issue #354
 2019-01-17 10:29:52 +11:00
Dawid Dziurla b6f8ebc0ca delete KeyReadable field from Binding struct 
also rewrite GetKey function
 2019-01-17 10:11:17 +11:00
KimMachineGune 3e24069722 pkg: Fix typo 2019-01-16 18:06:11 +11:00
Jesse Duffield c722ea5afc log in config directory rather than wherever you opened lazygit 2019-01-16 08:54:12 +11:00
KimMachineGune 7ff022f1e7 pkg/updates: Refactoring 2019-01-14 21:52:03 +11:00
Mark Kopenga 1db8801771 Update dutch.go 2018-12-20 09:17:10 +11:00
Mark Kopenga 666ea3a4a0 Fixed suggestion from glvr182 2018-12-20 09:17:10 +11:00
mjarkk 47d50989c4 Added dutch translations 2018-12-20 09:17:10 +11:00
Dawid Dziurla e4f70278dd i18n: pl translation 2018-12-20 09:13:41 +11:00
Jesse Duffield 0afffd03ca remove comment 2018-12-19 21:46:48 +11:00
Jesse Duffield 6c5e409ffa send direct error message 2018-12-19 20:12:35 +11:00
mjarkk 800b40ecc4 Translated credentials error with git push/pull/fetch 2018-12-19 10:06:58 +01:00
Jesse Duffield 7835fce708 fix tests 2018-12-18 22:40:36 +11:00
Jesse Duffield 160af3bb99 fix typo 2018-12-18 22:29:07 +11:00
Jesse Duffield 328b57e2cf no longer checking for 'exit status 128' because we're directly returning stderr 2018-12-18 22:27:50 +11:00
Jesse Duffield 20a94447d7 explicitly return newlines to our live command stdin 2018-12-18 22:23:17 +11:00
Jesse Duffield 865c7c2332 minor refactor of credentials panel into its own file 2018-12-18 22:19:32 +11:00
Jesse Duffield 276ac3a92e decrease frequency of refreshing files because it's causing index lock errors 2018-12-18 21:28:09 +11:00
Jesse Duffield c35255b7a9 set stderr ourselves so that we only read the error output if there is any 2018-12-18 21:25:49 +11:00
mjarkk f5f726e9c4 A try to hide the password from the error output 2018-12-17 08:58:09 +01:00
Jesse Duffield 4886b8350e always hide rather than delete the credentials view, and don't log on error in case there is a user password in the error 2018-12-16 17:28:04 +11:00
mjarkk af26b5f3e0 Tried to fix circleci 2018-12-14 13:45:43 +01:00
mjarkk 70cd6700e7 Tried to fix circleci 2018-12-14 13:43:13 +01:00
mjarkk d11f8989d9 Merge branch 'https-ask-for-username-password' of https://github.com/mjarkk/lazygit into https-ask-for-username-password 2018-12-14 13:40:40 +01:00
mjarkk 0fca27d022 Tried to fix circleci 2018-12-14 13:40:29 +01:00
Mark Kopenga 255319e597
Merge branch 'master' into https-ask-for-username-password 2018-12-14 11:13:29 +01:00
mjarkk 5d038dfd33 Removed the wired error handling 2018-12-12 22:11:31 +01:00
mjarkk 0577d3b97f Removed the username / password savety check 
This check is not realy needed because the change that it will show up a second time is so low that this is more work to check than the change it actualy might happen
 2018-12-12 21:08:53 +01:00
Jesse Duffield a26c15dafa some fixes for issues around the credentials panel 2018-12-12 22:34:20 +11:00
Jesse Duffield c71bcc64ed move fetch keybinding to files view to make way for branch-specific fetched 2018-12-12 22:33:42 +11:00
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 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
mjarkk e20d8366e1 Made gobot happy 2018-12-10 14:21:00 +01:00
mjarkk 76e9582739 Not always git fetch 2018-12-10 13:45:03 +01:00
mjarkk 50f20de8f3 Removed a lot of duplicated code 2018-12-10 08:22:52 +01:00
mjarkk 8e3f5e19e0 Changed some other names 2018-12-10 08:04:22 +01:00
mjarkk 61c2778de1 Changed pushPassUname name to credentials 2018-12-10 07:51:06 +01:00
mjarkk 3c17bf761a Better name for this function 2018-12-10 07:46:26 +01:00
mjarkk 696d6dc20c Fixed loop before error check 2018-12-10 07:43:32 +01:00
mjarkk f14effe5f5 Worked and fixed a view comments 2018-12-09 13:04:19 +01:00
mjarkk efb82a58ae Tried to fix circleci error 2018-12-08 16:54:00 +01:00
Mark Kopenga 19a6a32625
Merge branch 'master' into https-ask-for-username-password 2018-12-08 16:41:39 +01:00
mjarkk 270658fc00 Made code ready to merge to master's latest commit 2018-12-08 16:40:22 +01: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
mjarkk cf5a85b80f Intro message stays on screen now 2018-12-07 19:22:22 +01:00
mjarkk 2f7bd2896c Fixed error when there is no state.yml 2018-12-07 15:46:49 +01:00
mjarkk 8f904ffd72 Working popup 2018-12-07 14:56:29 +01:00
mjarkk ced81e11f0 Only show private repo popup when opening repo for first time 2018-12-06 22:05:16 +01:00
mjarkk 6d0fa8bc29 Made some small inprovements 2018-12-06 09:05:51 +01:00
mjarkk 21a808a52b Renamed branch to branches 2018-12-06 08:39:49 +01:00
mjarkk 89c272eed5 Removed the tabs for spaces 2018-12-06 08:33:04 +01:00
Mark Kopenga 1b6d34e76a
Merge branch 'master' into https-ask-for-username-password 2018-12-06 08:31:12 +01:00
mjarkk 6711543634 Made the gobot happy again 2018-12-06 08:28:56 +01:00
mjarkk f6e83cdbdf Started working on the popup 2018-12-06 08:26:05 +01: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 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
mjarkk c269ad1370 Made the bot happy 2018-12-02 15:06:51 +01:00
mjarkk 2edd2b74ff Removed a lot of useless code 2018-12-02 14:58:18 +01: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
mjarkk d91493b587 Forgot to set the git fetch timeout back to 60s 2018-11-25 13:23:32 +01:00
mjarkk 9da1382e09 Added credentials popup 2018-11-25 13:15:36 +01:00
mjarkk adfc00bcdc Changed the waitForGroup to a channel 2018-11-23 13:58:30 +01:00
Mark Kopenga b0eaf507a5
Merge branch 'master' into https-ask-for-username-password 2018-11-14 13:40:17 +01:00
mjarkk 448d9caf1b Fixed typo 2018-11-14 11:40:32 +01:00
Mark Kopenga 6d2bf0b0b5
Merge branch 'master' into https-ask-for-username-password 2018-11-14 11:34:39 +01: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
mjarkk 0c4c00c1bf Removed useless channel read 2018-11-14 11:14:31 +01: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
mjarkk 18a1070c2c Trying to fix circleci 2018-11-10 18:24:37 +01:00
mjarkk 9fafd7ebc1 Fixed case that a commit message will break git push 2018-11-10 18:10:53 +01:00
mjarkk 80c6e0a8c4 Fixed pushing forever 2018-11-10 17:02:39 +01:00
mjarkk 8742c4c110 Removed some variables and placed them inside the gui struct 2018-11-10 09:27:03 +01:00
mjarkk 32ecc6d745 Removed getPushPassUnameView function 2018-11-10 09:09:18 +01:00
mjarkk 834e42897d Switched back to github.com/mgutz/str instaid of a copy of ToArgv 2018-11-10 08:57:02 +01:00
mjarkk 500267417b Removed some duplicated code 2018-11-10 08:46:42 +01:00
mjarkk 18bcc0df4d Fixed no error text on windows 
when executing a command live on windows it detects errors but did just show a empty string
 2018-11-10 08:43:02 +01:00
mjarkk 5ae0e75e5e Switched to channels instaid of a mutex 2018-11-10 08:39:09 +01:00
mjarkk 1fd8cadd9e Replaced regex with trim 2018-11-10 08:14:35 +01: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
Mark Kopenga 17b4b4cb33
Merge branch 'master' into https-ask-for-username-password 2018-11-08 10:31:10 +01:00
Jesse Duffield 79ef98739d
Merge branch 'master' into feature/translations 2018-11-08 17:57:01 +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
mjarkk 9c8b241292 Removed some useless comments 2018-11-06 20:37:59 +01:00
mjarkk 7c4d360645 Better error for code 128 2018-11-06 20:25:11 +01:00
mjarkk ad77ac639e Working new lines in live pty output 2018-11-06 20:24:10 +01:00
mjarkk cf1e9f79b1 hopefully fixed the test now 2018-11-03 09:36:38 +01:00
mjarkk 8f0741a458 Changed the youtube link to a youtu.be short link 2018-11-03 09:19:47 +01:00
mjarkk 8469239d84 Fixed test 2018-11-03 09:12:45 +01:00
mjarkk af54d7f015 Fixed view not defined error with git push and pull 2018-11-02 15:07:10 +01:00
mjarkk cb9ad5bc73 Fixed golangcibot surgestion 2018-11-02 10:06:10 +01:00
mjarkk 5470bb4121 Added username password detect to git pull 2018-11-02 09:54:54 +01:00
mjarkk 0e53a26d6f Maybe fixed the test this time 2018-11-01 07:06:34 +01:00
mjarkk 3938138ebc Hopefully fixed circleci 2018-10-31 19:25:52 +01:00
mjarkk 05f0e5120a Fixed one text 2018-10-31 17:55:02 +01:00
mjarkk 5532289086 Fixed some tests 2018-10-31 17:36:20 +01:00
mjarkk 78b2bc4f60 Made a better way of test pushing 2018-10-31 16:23:58 +01:00
mjarkk 9585f49490 Made error handling better 2018-10-29 08:23:56 +01: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
mjarkk 372b333662 Added copy note at top of string-to-args.go 2018-10-27 17:08:25 +02:00
mjarkk 18f09a14e6 Removed package github.com/mgutz/str for better code coverage 2018-10-27 17:06:33 +02:00
mjarkk ed564adb4a Removed github.com/ionrock/procs for better code coverage 2018-10-27 16:57:34 +02:00
mjarkk 9a99748d3b Fixed bug where username input didn't go away 2018-10-27 16:29:16 +02:00
mjarkk 9163110640 Removed error check for regex 
Regexp only returns an error when regex string is in-corret
 2018-10-27 15:52:12 +02:00
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 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
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
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
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
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 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
Jesse Duffield 2229a6e133
Merge branch 'master' into hotfix/commit-message-panel-focus 2018-09-21 16:43:37 +10:00
Jesse Duffield 70ee4faf15 add removeAll to git 2018-09-21 09:23:00 +10:00
Anthony HAMON 360b7c1def commands/git : refactor test to Diff, refactor function 2018-09-20 09:11:47 +02:00
Anthony HAMON bdeb78c9a0 commands/git : returns an error instead of panicing 2018-09-20 09:09:37 +02:00
Anthony HAMON 9481920101 commands/git : add test to GetLog 2018-09-20 09:09:37 +02:00
Jesse Duffield a2b3cd0823 add removeAll to git 2018-09-20 09:48:56 +10:00