Jesse Duffield
0d3a193ab5
Add 'w' keybinding in files panel to commit as a WIP
...
If your git.skipHookPrefix is set to, say, WIP, in your config, then
hitting 'w' in the files panel will bring up the commit message panel
with 'WIP' pre-filled, so you just need to hit enter to confirm
(or add some more to the message) in order to commit your changes
with the --no-verify flag, meaning the pre-commit hook will be skipped
2019-04-13 14:38:17 +10:00
Peter Lundberg
7ff07e1454
Always include atleast 2 commits when doing squash and fixup
2019-04-10 17:17:31 +10:00
Jesse Duffield
55538a3695
support custom commands
2019-04-07 17:15:01 +10:00
Jesse Duffield
60e33f5d8c
Allow for creating fixup! commits
2019-04-07 13:13:40 +10:00
skanehira
f34be1896a
fixed some #397
2019-04-06 13:02:20 +11:00
skanehira
c350cdba43
add feature of display diff between specific commits #397
2019-04-06 13:02:20 +11:00
Jesse Duffield
acfc961909
move soft reset keybinding into reset options
2019-03-23 13:26:17 +11:00
Jesse Duffield
f502f75e1f
add more options for resetting files in the working tree
2019-03-23 13:26:17 +11:00
Jesse Duffield
ff97ef7b94
support discarding unstaged changes
2019-03-23 13:26:17 +11:00
skanehira
32ddf0c296
generate commit files keybind
2019-03-18 09:49:23 +11:00
Jesse Duffield
e583cc2519
allow autostashing changes when checking out a branch
2019-03-16 12:51:48 +11:00
Jesse Duffield
43e5c042a2
prompt user to git init when outside a repo
2019-03-16 11:38:16 +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
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
dbb01b028d
populate dutch and polish i18n files with new messages
2019-03-02 21:31:48 +11:00
Jesse Duffield
7a170bbccf
extend cheatsheet generator to contain context based keybindings
2019-03-02 19:05:21 +11:00
Jesse Duffield
e331dfcaf8
update i18n
2019-03-02 17:46:56 +11:00
Jesse Duffield Duffield
23c51ba708
cleanup
2019-02-24 18:34:18 +11:00
Jesse Duffield Duffield
a8858cbd12
support cherry picking commits
2019-02-24 13:51:52 +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
0228e25084
work towards more interactive rebase options
2019-02-19 23:36:36 +11:00
Jesse Duffield
d44638130c
add various interactive rebase commands
2019-02-18 23:27:54 +11:00
Jesse Duffield
adc2529019
dealing better with errors at the top level
2019-02-18 19:42:23 +11:00
Jesse Duffield
e011e9bc42
more work on rebasing feature
2019-02-16 21:01:17 +11:00
Jesse Duffield
198cbee498
introduce panel contexts and more work on rebasing
2019-02-16 12:07:27 +11:00
Jesse Duffield
3d343e9b57
Merge branch 'master' into feature/rebasing
2019-02-11 21:02:53 +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
c71bcc64ed
move fetch keybinding to files view to make way for branch-specific fetched
2018-12-12 22:33:42 +11:00
Jesse Duffield
9489a94473
Make merge panel its own panel
2018-12-11 22:02:12 +11:00
Glenn Vriesman
7b850c56c4
Added some translations
2018-12-11 09:39:54 +11:00
mjarkk
8e3f5e19e0
Changed some other names
2018-12-10 08:04:22 +01:00
Mark Kopenga
19a6a32625
Merge branch 'master' into https-ask-for-username-password
2018-12-08 16:41:39 +01:00
Jesse Duffield
ff856b7630
fetching branches without checking out
2018-12-08 11:51:47 +11:00
mjarkk
8f904ffd72
Working popup
2018-12-07 14:56:29 +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
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
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
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
mjarkk
9da1382e09
Added credentials popup
2018-11-25 13:15:36 +01:00
Mark Kopenga
6d2bf0b0b5
Merge branch 'master' into https-ask-for-username-password
2018-11-14 11:34:39 +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
Mark Kopenga
45c249acca
Merge branch 'master' into https-ask-for-username-password
2018-10-27 15:06:51 +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
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
Kristijan Husak
df0e3e52fe
Add option to create pull request form branches panel.
2018-10-13 22:54:51 +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
Kristijan Husak
28fe3d6cf9
Use confirmation popup for amending last commit.
2018-09-25 22:11:51 +02:00
Jesse Duffield
7164f37266
Merge branch 'master' into feature/commit-amend
2018-09-25 19:05:24 +10:00
Jesse Duffield
e91fb21233
add recent repos menu option
2018-09-19 19:15:29 +10:00
Jesse Duffield
768b9453f8
Merge branch 'hotfix/cursor-positioning' into feature/recent-repos
2018-09-19 18:40:41 +10:00
Kristijan Husak
61f0801bd3
Add ammend commit action.
2018-09-13 12:44:32 +02:00
mjarkk
07f87eb7cf
Added missing dutch translations
2018-09-10 08:08:53 +02:00
Dawid Dziurla
63e400647a
shorter english string
2018-09-09 10:47:13 +02:00
Dawid Dziurla
6f7de83bce
Merge branch 'master' into feature/help
...
conflicts resolved
2018-09-09 10:41:01 +02:00
Dawid Dziurla
e9268d1828
add confirmOnQuit config option
2018-09-05 19:56:11 +02:00
Dawid Dziurla
4188786749
update pl translation
2018-09-05 15:20:34 +02:00
Dawid Dziurla
906f8e252e
include global keybindings in menu
2018-09-05 13:16:40 +02:00
Dawid Dziurla
557009e660
help -> menu
2018-09-05 11:12:11 +02:00
Dawid Dziurla
e21f739f4f
add renderGlobalOptions
...
render only global options for all panels
2018-09-04 16:07:31 +02:00
Dawid Dziurla
93e88ea8fe
add missing translated polish strings
2018-09-03 18:34:04 +02:00
Dawid Dziurla
a2073528f4
add missing untranslated dutch strings
...
@mjarkk
2018-09-03 18:33:38 +02:00
Dawid Dziurla
230a5afa4c
remove capitalization of keybindings descriptions
2018-09-03 18:16:54 +02:00
Dawid Dziurla
b5827b7d80
merge conflict effect fix
2018-09-03 17:57:03 +02:00
Dawid Dziurla
83b7c60246
add untranslated dutch strings
...
@mjarkk
2018-09-03 17:54:06 +02:00
Dawid Dziurla
323016aa01
polish translation
2018-09-03 17:54:06 +02:00
Dawid Dziurla
b403b6e46d
better english string
2018-09-03 17:54:06 +02:00
Dawid Dziurla
90a4cada82
add missing descriptions
2018-09-03 17:54:06 +02:00
Dawid Dziurla
9ceaf5b9a9
move descriptions to i18n
2018-09-03 17:52:05 +02:00
Dawid Dziurla
28a9594ef7
update help panel
...
- delete scrolling ability
- lines are now selectable
- implemented handler execution when space is pressed
- add example descriptions for status panel keybindings
2018-09-03 17:52:05 +02:00
Dawid Dziurla
2416f585ce
initial help panel
2018-09-03 17:52:05 +02:00
Jesse Duffield
42500817e0
better error for nonbackwards compatible changes
2018-09-01 10:36:55 +10:00
Jesse Duffield
7e1e97d050
dont panic when catting directories
2018-08-28 19:12:35 +10:00
Jesse Duffield
320ccdb22a
when panicking due to malformed gitconfig, show a more useful error
2018-08-28 18:01:53 +10:00
Jesse Duffield
da2d3f253f
better translation
2018-08-27 20:58:17 +10:00