Jesse Duffield
e73937c2bd
more work on new layout functionality
2020-08-13 21:50:23 +10:00
Jesse Duffield
b51ad4fcea
softcode cyclable views
2020-08-13 21:50:23 +10:00
Jesse Duffield
d1a7c7283f
some more changes
2020-08-13 21:50:23 +10:00
Jesse Duffield
b641ecdc74
move some things around
2020-08-13 21:50:23 +10:00
Jesse Duffield
13f567ff4c
add portrait mode for when the window is really tall
2020-08-13 21:50:23 +10:00
Jesse Duffield
771d4b5811
refactor how we handle layouts
2020-08-13 21:50:23 +10:00
Jesse Duffield
3c944e0351
support force push after failure
2020-08-12 21:11:24 +10:00
Jesse Duffield
e26af258d6
allow rebasing onto remote branch
2020-08-12 20:58:34 +10:00
Jesse Duffield
76e5ec6d45
immediately quit when pressing q in diff or filter mode
2020-08-12 20:44:29 +10:00
Jesse Duffield
27cd12e2d9
accept umlaut keybindings
2020-08-12 20:07:56 +10:00
Jesse Duffield
bfaf1c4f70
use remote prefixed branch name when merging remote branch
2020-08-12 20:07:46 +10:00
Jesse Duffield
2d18d089ce
allow entering a password when fast forwarding another branch
2020-08-12 18:47:16 +10:00
Jesse Duffield
9c7e40906d
rename arg
2020-08-12 18:47:16 +10:00
Jesse Duffield
401f291c3b
lowercase function name
2020-08-12 18:47:16 +10:00
Jesse Duffield
bea2ae5ff5
stop pulling in general
2020-08-12 18:47:16 +10:00
Jesse Duffield
f49e4946f2
minor refactor
2020-08-12 18:47:16 +10:00
Jesse Duffield
8ff74072f8
update config
2020-08-12 18:47:16 +10:00
Jesse Duffield
fcd5aea04e
support multiple modes of git pull
2020-08-12 18:47:16 +10:00
Jesse Duffield
1c0da2967c
update naming
2020-08-12 18:47:16 +10:00
Jesse Duffield
1b78a42b80
pass callback directly
2020-08-12 18:47:16 +10:00
Jesse Duffield
79e73d2eff
minor cleanup
...
WIP
2020-08-12 18:47:16 +10:00
Jesse Duffield
23299f88e9
simplify patch modifier interface
2020-08-09 15:42:20 +10:00
mjarkk
ef744e45c1
Update dutch translations
2020-08-08 14:25:11 +10:00
Jesse Duffield
660cc2f3d1
follow cursor when staging and unstaging a file rename
2020-08-07 18:59:56 +10:00
Jesse Duffield
469ac116ef
allow renames to be discarded
2020-08-07 18:01:26 +10:00
Axel Navarro
d49e75bd3e
Add tab keybinding in commit message
2020-07-26 16:28:01 +10:00
Jesse Duffield
f4718a9047
allow editing commit files
2020-07-21 18:24:39 +10:00
Jesse Duffield
7d5fe4b66c
better logic for staging a renamed file
2020-07-19 14:11:32 +10:00
Jesse Duffield
845c80721f
Decouple escaping from quitting
...
When a user is not entering text into a prompt, the 'q' key should immediately
quit the application. On the other hand, the 'esc' key should cancel/close/go-back
to the previous context.
If we're at the surface level (nothing to cancel/close) and the user hits the
escape key, the default behaviour is to close the app, however we now have a
`quitOnTopLevelReturn` config key to override this.
I actually think from the beginning we should have made this config option
default to false rather than true which is the default this PR gives it,
but I don't want to anger too many people familiar with the existing behaviour.
2020-07-18 20:00:48 +10:00
Jesse Duffield
a9cc321981
prompt to create new branch if branch not found
2020-07-17 09:20:50 +10:00
Jesse Duffield
6349214f00
prompt to commit all files if committing with no staged files
2020-07-17 09:01:40 +10:00
Randshot
96f821b841
fix TestGitCommandCommit test
...
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-07-15 09:41:16 +10:00
Randshot
964e3872c1
revert changes to 'os_default_platform.go' and 'os_windows.go'
...
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-07-15 09:41:16 +10:00
Randshot
5dfa26ea8b
use strconv for quoting in 'GitCommand.Commit' and 'OSCommand.ShellCommandFromString'
...
use raw strings for the escaped quotes in 'os_default_platform.go' and 'os_windows.go'
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-07-15 09:41:16 +10:00
Randshot
014e06eefd
factor out duplicate code into 'ShellCommandFromString'
...
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-07-14 08:26:53 +10:00
Randshot
39a2122dc0
add quotes around the git commit command on non-windows systems
...
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-07-14 08:26:53 +10:00
Randshot
570d27ffaa
Merge branch 'master' into add-overrideGpg-switch
...
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-07-12 11:47:35 +02:00
Randshot
21e478dd59
fix 'Amend commit using gpg' test
...
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-07-12 14:06:53 +10:00
Randshot
d14fb36cb9
fix 'Commit using gpg' test
...
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-07-12 14:06:53 +10:00
Randshot
19a808642f
fix platform specific quoting when using GPG
...
fixes #620
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-07-12 14:06:53 +10:00
Jasper Mendiola
e921ba0910
Remove getLocalGitConfig
2020-07-10 18:55:00 +10:00
Jasper Mendiola
0f5a073d57
Rename appconfig to config
2020-07-10 18:55:00 +10:00
Jasper Mendiola
cb0bdd89c0
fix tests
2020-07-10 18:55:00 +10:00
Jasper Mendiola
e89bf5d06b
add oneline-graph
2020-07-10 18:55:00 +10:00
Randshot
65e955c622
add overrideGpg switch, which prevents lazygit from spawning a separate process when using GPG
...
Signed-off-by: Randshot <randshot@norealm.xyz>
2020-05-30 23:39:07 +02:00
Dima Kotik
e73f4c6b7e
Better CWD check for a git repository.
2020-05-30 00:31:58 +10:00
Jesse Duffield
cf5cefb2d6
allow user to scroll themselves inside merge panel
2020-05-19 18:44:53 +10:00
Jesse Duffield
36ac764133
fix race condition when scrolling to merge conflict
2020-05-19 18:05:14 +10:00
Jesse Duffield
003e45d2f5
allow creating branches off of remote branches
2020-05-19 09:57:37 +10:00
Jesse Duffield
04e93317b8
fix https://github.com/jesseduffield/lazygit/issues/848
2020-05-19 09:57:37 +10:00