59f5f5c1af
refactor
2020-08-23 14:29:18 +10:00
e6a1bd6566
generalise patch building stuff
2020-08-23 14:29:18 +10:00
609f3f4bfa
rename Sha to parent now that we're also considering stash entries
2020-08-23 14:29:18 +10:00
2d90e1e8ee
commit files kind of generalised
2020-08-23 14:29:18 +10:00
7561f5aa32
some more standardisation for diffing
2020-08-23 14:29:18 +10:00
db826b3c87
add keybinding to create new branch off of commit
...
retain focus in commits panel
surface prompt errors
better description
2020-08-16 22:24:54 +10:00
be658e7d64
support multi word editor config
2020-08-16 20:37:40 +10:00
53f06f6a4e
prefill commit reword editor
2020-08-16 20:37:24 +10:00
826d1660c9
move patch stuff into its own package
2020-08-15 11:41:37 +10:00
291a8e4de0
allow opening files on the selected line in the staging panel
2020-08-15 11:41:37 +10:00
2d18d089ce
allow entering a password when fast forwarding another branch
2020-08-12 18:47:16 +10:00
9c7e40906d
rename arg
2020-08-12 18:47:16 +10:00
bea2ae5ff5
stop pulling in general
2020-08-12 18:47:16 +10:00
fcd5aea04e
support multiple modes of git pull
2020-08-12 18:47:16 +10:00
1c0da2967c
update naming
2020-08-12 18:47:16 +10:00
23299f88e9
simplify patch modifier interface
2020-08-09 15:42:20 +10:00
660cc2f3d1
follow cursor when staging and unstaging a file rename
2020-08-07 18:59:56 +10:00
469ac116ef
allow renames to be discarded
2020-08-07 18:01:26 +10:00
7d5fe4b66c
better logic for staging a renamed file
2020-07-19 14:11:32 +10:00
96f821b841
fix TestGitCommandCommit test
...
Signed-off-by: Randshot <randshot@norealm.xyz >
2020-07-15 09:41:16 +10:00
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
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
014e06eefd
factor out duplicate code into 'ShellCommandFromString'
...
Signed-off-by: Randshot <randshot@norealm.xyz >
2020-07-14 08:26:53 +10:00
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
570d27ffaa
Merge branch 'master' into add-overrideGpg-switch
...
Signed-off-by: Randshot <randshot@norealm.xyz >
2020-07-12 11:47:35 +02:00
21e478dd59
fix 'Amend commit using gpg' test
...
Signed-off-by: Randshot <randshot@norealm.xyz >
2020-07-12 14:06:53 +10:00
d14fb36cb9
fix 'Commit using gpg' test
...
Signed-off-by: Randshot <randshot@norealm.xyz >
2020-07-12 14:06:53 +10:00
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
e921ba0910
Remove getLocalGitConfig
2020-07-10 18:55:00 +10:00
0f5a073d57
Rename appconfig to config
2020-07-10 18:55:00 +10:00
cb0bdd89c0
fix tests
2020-07-10 18:55:00 +10:00
e89bf5d06b
add oneline-graph
2020-07-10 18:55:00 +10:00
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
04e93317b8
fix https://github.com/jesseduffield/lazygit/issues/848
2020-05-19 09:57:37 +10:00
f8dedb710b
additional password prompt regex
2020-05-15 22:18:07 +10:00
1c259f69f6
check if user has configured to push to current by default
2020-05-15 21:41:23 +10:00
913f17ee3e
prevent flicker from bolding background of selected line
2020-05-15 21:12:12 +10:00
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
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
cc13ae252a
totally screwed up the last commit
2020-04-22 11:21:20 +10:00
b97f844a3e
handle comments in todo files
2020-04-22 11:15:41 +10:00
304607ae5d
support configurable merge args
2020-04-20 18:40:49 +10:00
66d7d5f312
fix: fixed gpg breaking terminal
...
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com >
2020-04-20 18:30:57 +10:00
2974a57943
support copying stuff to clipboard
2020-04-15 10:44:56 +00:00
40fbce91ce
add new diff mode
...
WIP
WIP
WIP
WIP
WIP
WIP
WIP
2020-03-29 18:26:24 +11:00
33d287d2f0
remove old diff mode code
2020-03-29 18:26:24 +11:00
a2790cfe8e
rename to filtered mode
2020-03-29 11:37:29 +11:00
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
517b7d0283
fix up some things with the patch handling stuff
2020-03-28 13:19:35 +11:00
0c0231c3e8
autostash changes when pulling file into index
2020-03-28 13:19:35 +11:00