Jesse Duffield
f99d5f74d4
drop merge commits when interactive rebasing just like git CLI
2020-08-27 21:51:07 +10:00
Jesse Duffield
e2f3b2b41f
add log when git status errors
2020-08-25 08:04:45 +10:00
Jesse Duffield
7ebb8343d1
ignore warning messages about files when obtaining file statuses
2020-08-24 11:53:17 +00:00
Jesse Duffield
9f71c8d2b9
rename Status to PatchStatus
2020-08-23 15:11:06 +10:00
Jesse Duffield
fce7cdcc0a
enlargen stash window when its focused
2020-08-23 15:11:06 +10:00
Jesse Duffield
4fb52ce2ab
better handling of there being no commit files
2020-08-23 15:11:06 +10:00
Jesse Duffield
2915134007
show file statuses in commit files view
2020-08-23 15:11:06 +10:00
Jesse Duffield
148f601bcb
cleanup now that we're always using the same diff command
2020-08-23 14:29:18 +10:00
Jesse Duffield
43d891b8d6
support creating patches from files in diff mode
2020-08-23 14:29:18 +10:00
Jesse Duffield
2eee079d3a
minor rename
2020-08-23 14:29:18 +10:00
Jesse Duffield
30a555b108
don't needlessly load every file
2020-08-23 14:29:18 +10:00
Jesse Duffield
12bf851c7d
faster patch manager
2020-08-23 14:29:18 +10:00
Jesse Duffield
e290710f67
support drilling down into the files of a diff
2020-08-23 14:29:18 +10:00
Jesse Duffield
e6a1bd6566
generalise patch building stuff
2020-08-23 14:29:18 +10:00
Jesse Duffield
609f3f4bfa
rename Sha to parent now that we're also considering stash entries
2020-08-23 14:29:18 +10:00
Jesse Duffield
2d90e1e8ee
commit files kind of generalised
2020-08-23 14:29:18 +10:00
Jesse Duffield
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
Jesse Duffield
53f06f6a4e
prefill commit reword editor
2020-08-16 20:37:24 +10:00
Jesse Duffield
826d1660c9
move patch stuff into its own package
2020-08-15 11:41:37 +10:00
Jesse Duffield
2d18d089ce
allow entering a password when fast forwarding another branch
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
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
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
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
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
1c259f69f6
check if user has configured to push to current by default
2020-05-15 21:41:23 +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
304607ae5d
support configurable merge args
2020-04-20 18:40:49 +10: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
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
a9559a5c87
move working tree state function into git.go
2020-03-28 13:19:35 +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
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
Jesse Duffield
fbbd16bd82
use reflogs from state to work out branch recencies
2020-03-28 11:59:45 +11:00
Jesse Duffield
bd2c1eef53
remove redundant fetch of reflog
2020-03-28 11:59:45 +11:00