2d18d089ce
allow entering a password when fast forwarding another branch
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
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
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
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
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
1c259f69f6
check if user has configured to push to current by default
2020-05-15 21:41:23 +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
304607ae5d
support configurable merge args
2020-04-20 18:40:49 +10:00
40fbce91ce
add new diff mode
...
WIP
WIP
WIP
WIP
WIP
WIP
WIP
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
a9559a5c87
move working tree state function into git.go
2020-03-28 13:19:35 +11:00
036b53acf8
in fact we don't need any of these options
2020-03-28 11:59:45 +11:00
919463ff02
actually don't even bother limiting
2020-03-28 11:59:45 +11:00
3f7ec3f3b8
load reflog commits in two stages to speed up startup time
2020-03-28 11:59:45 +11:00
19604214d7
discard old reflog commits when in new context
2020-03-28 11:59:45 +11:00
d0336fe16f
better presentation of remotes
2020-03-28 11:59:45 +11:00
198d237679
more centralised handling of refreshing
2020-03-28 11:59:45 +11:00
fbbd16bd82
use reflogs from state to work out branch recencies
2020-03-28 11:59:45 +11:00
bd2c1eef53
remove redundant fetch of reflog
2020-03-28 11:59:45 +11:00
d1395b15bb
use GIT_EDITOR
2020-03-27 19:26:14 +11:00
2d8ed5e274
*: update go-git import
2020-03-27 19:06:21 +11:00
f2036b42e5
only load new reflog entries
2020-03-26 21:44:33 +11:00
d027cf969c
better handling of current branch name
2020-03-26 20:37:06 +11:00
0e23f44b84
support reflog action prefix
2020-03-25 09:39:04 +11:00
f80d15062b
use reflog undo history pointer
2020-03-25 09:39:04 +11:00
3d3e0be7bd
more compatible commands
2020-03-23 22:33:17 +11:00
1be0ff8da7
better upstream tracking and allow renaming a branch
2020-03-18 21:29:06 +11:00
19146d61b1
use selected branch as base when creating a new branch
2020-03-08 18:44:15 +11:00
6ca08c6519
make branches and files non-ambiguous for git-log
...
fixes #694
2020-03-06 09:25:31 +11:00
0fc58a7986
fix test
2020-03-04 00:12:23 +11:00
54241d8ab9
more generic way of supporting custom pagers
2020-03-04 00:12:23 +11:00
355f1615ab
supporing custom pagers step 1
2020-03-04 00:12:23 +11:00
bf946200e9
Fix OutOfBound array access when looking for ReflogCommits
...
refs #679
2020-02-27 09:34:40 +11:00
02c497fad6
show file list when diffing commits
2020-02-25 21:38:38 +11:00
370cec098b
show diff stat
2020-02-24 09:20:50 +11:00
6fc3290a05
Reflog: Use 20 sha digits instead of 7
...
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com >
2020-02-20 08:34:01 +11:00
66e6369c28
allow fastforwarding the current branch
2020-02-18 23:07:38 +11:00
9f5397a2d4
Moved function to git.go
...
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com >
2020-02-06 23:19:29 +11:00
