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
bea2ae5ff5
stop pulling in general
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
23299f88e9
simplify patch modifier interface
2020-08-09 15:42:20 +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
Jesse Duffield
7d5fe4b66c
better logic for staging a renamed file
2020-07-19 14:11:32 +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
Jesse Duffield
04e93317b8
fix https://github.com/jesseduffield/lazygit/issues/848
2020-05-19 09:57:37 +10:00
Jesse Duffield
f8dedb710b
additional password prompt regex
2020-05-15 22:18:07 +10:00
Jesse Duffield
1c259f69f6
check if user has configured to push to current by default
2020-05-15 21:41:23 +10:00
Jesse Duffield
913f17ee3e
prevent flicker from bolding background of selected line
2020-05-15 21:12:12 +10:00
Gary Yendell
7ed8ee160d
Add option to split patch into a new commit
...
Add GetHeadCommitMessage to read the subject of the HEAD commit
Create PullPatchIntoNewCommit based heavily on PullPatchIntoIndex to
split the current patch from its commit and apply it in a separate
commit immediately after.
WIP to Squash - Fill format string with format string
WIP
2020-05-09 11:59:37 +10:00
Tyler Davis
b5404c6159
fix issue #640 add catCmd and OS-specific values
...
Add a catCmd to the Platform struct and set the value to "cat" for
non-windows builds and "type" for windows builds.
2020-04-27 19:14:18 +10:00
Jesse Duffield
cc13ae252a
totally screwed up the last commit
2020-04-22 11:21:20 +10:00
Jesse Duffield
b97f844a3e
handle comments in todo files
2020-04-22 11:15:41 +10:00
Jesse Duffield
304607ae5d
support configurable merge args
2020-04-20 18:40:49 +10:00
Glenn Vriesman
66d7d5f312
fix: fixed gpg breaking terminal
...
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
2020-04-20 18:30:57 +10:00
Jesse Duffield
2974a57943
support copying stuff to clipboard
2020-04-15 10:44:56 +00:00
Jesse Duffield
40fbce91ce
add new diff mode
...
WIP
WIP
WIP
WIP
WIP
WIP
WIP
2020-03-29 18:26:24 +11:00
Jesse Duffield
33d287d2f0
remove old diff mode code
2020-03-29 18:26:24 +11:00
Jesse Duffield
a2790cfe8e
rename to filtered mode
2020-03-29 11:37:29 +11:00
Jesse Duffield
624ae45ebb
allow scoped mode where the commits/reflog/stash panels are scoped to a file
...
WIP
restrict certain actions in scoped mode
WIP
2020-03-29 11:37:29 +11:00
Jesse Duffield
517b7d0283
fix up some things with the patch handling stuff
2020-03-28 13:19:35 +11:00
Jesse Duffield
0c0231c3e8
autostash changes when pulling file into index
2020-03-28 13:19:35 +11:00
Jesse Duffield
a9559a5c87
move working tree state function into git.go
2020-03-28 13:19:35 +11:00
Jesse Duffield
814ee24c8d
better error handling
2020-03-28 11:59:45 +11:00
Jesse Duffield
e9051355a1
fix test
2020-03-28 11:59:45 +11:00
Jesse Duffield
036b53acf8
in fact we don't need any of these options
2020-03-28 11:59:45 +11:00
Jesse Duffield
919463ff02
actually don't even bother limiting
2020-03-28 11:59:45 +11:00
Jesse Duffield
3f7ec3f3b8
load reflog commits in two stages to speed up startup time
2020-03-28 11:59:45 +11:00
Jesse Duffield
19604214d7
discard old reflog commits when in new context
2020-03-28 11:59:45 +11:00
Jesse Duffield
c1a4bd0482
more smart refreshing
...
WIP
WIP
WIP
WIP
WIP
fix how diff entries are handled
WIP
WIP
WIP
WIP
WIP
WIP
2020-03-28 11:59:45 +11:00
Jesse Duffield
d0336fe16f
better presentation of remotes
2020-03-28 11:59:45 +11:00
Jesse Duffield
198d237679
more centralised handling of refreshing
2020-03-28 11:59:45 +11:00