1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-12 23:41:54 +03:00
Commit Graph

2693 Commits

Author SHA1 Message Date
a1c6adab59 Merge branch 'master' into feature/anonymous-reporting 2018-08-27 18:50:24 +10:00
540edc0c35 anonymous reporting data 2018-08-26 16:53:31 +10:00
f6ab11e4ee run gofmt 2018-08-26 02:20:01 +02:00
23fe0290ad add openFile to gui struct 2018-08-26 01:58:20 +02:00
364c1ac5e7 remove useless returned variable 2018-08-26 01:58:19 +02:00
883fcf1083 remove useless returned variable 2018-08-26 01:58:19 +02:00
57decdd11d check error from setViewOnBottom 2018-08-25 17:38:03 +10:00
21f6e9ba87 auto-updates 2018-08-25 17:32:34 +10:00
f24c95aede Merge branch 'master' into feature/auto-updates 2018-08-25 11:02:46 +10:00
60422912c8 add 'a' keybinding to toggle staged/unstaged for all files 2018-08-25 08:59:51 +10:00
6c389df57d Merge pull request #200 from remyabel/feature/esc-quits
Esc will quit when not in popup, fixes #197
2018-08-24 09:16:56 +10:00
bcbeec1a56 Sirupsen -> sirupsen 2018-08-23 14:22:03 +02:00
5628eae502 WIP 2018-08-23 18:43:16 +10:00
110ff38c0d Remove accidentally checked in code 2018-08-22 11:34:16 -04:00
4d635cd1cd Merge pull request #151 from alcohol/force-delete-branch
add option to force delete given branch
2018-08-21 23:45:27 +10:00
cd4063c763 s/escape/quit 2018-08-21 08:54:51 -04:00
646c205227 s/quit/escape, don't use special handling for views 2018-08-21 07:50:37 -04:00
dc911906b3 Esc will quit when not in popup, fixes #197 2018-08-21 06:36:20 -04:00
182e475116 correct variable assignment 2018-08-21 12:09:13 +02:00
5f6b61d28c adjust translation(s) for forced branch deletion 2018-08-21 12:06:42 +02:00
810540edfa add return 2018-08-21 11:32:17 +02:00
c6a8899060 Merge pull request #160 from remyabel/157_remove_bom
#157: clean BOM, allowing CSV files to display correctly
2018-08-21 17:39:55 +10:00
37029f7db3 support empty version string 2018-08-20 20:52:32 +10:00
954dfb12e4 Merge branch 'master' into feature/auto-updates 2018-08-20 19:53:53 +10:00
d938a437a2 WIP auto updates 2018-08-20 19:52:20 +10:00
8e3df6b981 add option to force delete given branch 2018-08-20 08:37:16 +02:00
e8b12a086c Fix ineffectual assignment 2018-08-19 08:52:08 -04:00
766197de9d NormalizeLinefeeds removes rather than converts Window/Mac style lf's 2018-08-19 08:48:03 -04:00
317926c808 fix golangci lint 2018-08-19 21:34:24 +10:00
4d2346f80a popup force push confirmation panel if the local branch has diverged from the upstream branch 2018-08-19 21:28:13 +10:00
d2bdac29aa Merge branch 'master' into 157_remove_bom 2018-08-19 07:22:48 -04:00
cea736e6e9 Factor out into NormalizeLinefeeds; add tests 2018-08-19 07:20:50 -04:00
aa4d739577 fix ignore feature 2018-08-19 20:41:04 +10:00
c5d4024d58 compare error message rather than error itself on no-commits error 2018-08-19 18:51:42 +10:00
b46d174f70 view_helpers.go: don't ignore return value 2018-08-19 02:21:33 -04:00
cdc6d45fa4 view_helpers.go: replace \r with \r\n 2018-08-19 02:19:19 -04:00
08666889f4 improve remove file logic 2018-08-18 20:14:44 +10:00
f025b289f0 enforce white text color in prompt panels 2018-08-18 16:23:19 +10:00
9a923eb300 Merge branch 'master' into 157_remove_bom 2018-08-18 02:11:13 -04:00
29431ddc8e create dashboard 2018-08-18 15:30:56 +10:00
a1a828a781 support opening and editing config file 2018-08-18 14:54:05 +10:00
6b150a4be0 bump dependencies 2018-08-18 14:20:19 +10:00
284c534251 user configurable border colors 2018-08-18 13:53:58 +10:00
10fdb5a609 support writing back to user config 2018-08-18 13:22:05 +10:00
4dc6d40b5a merge master 2018-08-18 12:08:21 +10:00
64d8a55dbd Merge branch 'master' into 157_remove_bom 2018-08-16 07:59:31 -04:00
fcf616bd62 Fixed it 2018-08-16 13:35:04 +02:00
74d81ae080 [rebase] Fix errors; update dependencies
Argument must be []byte not string

Don't commit bomtest.txt
2018-08-16 07:17:47 -04:00
faf218f465 Fixed comments from jesseduffield on issue #137 2018-08-16 11:31:50 +02:00
90746502df Fixed comments from jesseduffield on issue #137 2018-08-16 11:31:03 +02:00