5e45ae1584
fix applying patch on Windows machine
...
This bug was caused how the timestamp was formatted for the patch file.
On Windows machines, ":" is an invalid character for a filename, but the
`stampNano` format for time contains ":".
This fix adjusts the time format to be the `stampNano` format with "."
subsituted for ":".
2020-01-05 20:01:20 +00:00
3f4613feb0
allow fetching remotes with 'f'
2019-12-07 16:23:04 +11:00
e18e81f5eb
don't pass single commands directly to RunCommand (or equivalent function)
...
when it contains percentages.
This is a really strange one. It's a linting warning in my editor
and it doesn't stop me from compiling, but it breaks `go test`.
A basic file to reproduce what I'm talking about:
package main
import "fmt"
func main() {
notSprintf("test %s") // compiler complains here thinking %s needs a corresponding argument
}
func notSprintf(formatStr string, formatArgs ...interface{}) string {
if formatArgs != nil {
return formatStr
}
return fmt.Sprintf(formatStr, formatArgs...)
}
2019-11-21 22:07:14 +11:00
67a446234c
fix specs
2019-11-21 22:07:14 +11:00
e36ee0b4f1
give RunCommand the same input signature as fmt.Sprintf
2019-11-21 22:07:14 +11:00
3c13229145
add tags panel
2019-11-21 22:07:14 +11:00
cea24c2cf9
allow editing remotes
2019-11-21 22:07:14 +11:00
07cbae4019
support setting upstream
2019-11-21 22:07:14 +11:00
b42202ea1c
better fast forward
2019-11-21 22:07:14 +11:00
a9cd647075
support deleting remote branches
2019-11-21 22:07:14 +11:00
2afbd7ba7f
support merging remote branches into checked out branch
2019-11-21 22:07:14 +11:00
55ff0c0dee
support detached heads when showing the selected branch
2019-11-21 22:07:14 +11:00
6b7aaeca45
support adding/removing remotes
2019-11-21 22:07:14 +11:00
325408d0e3
get remote branches when getting remotes
2019-11-21 22:07:14 +11:00
eeb667954f
trying to use gogit with branches from remotes
2019-11-21 22:07:14 +11:00
092f27495a
add remote model
2019-11-21 22:07:14 +11:00
3b1d705473
show upstream branch for branch
2019-11-13 22:25:42 +11:00
f43ba728e3
prompt to set upstream when pulling on untracked branch
...
prompt to set upstream when pulling on untracked branch
2019-11-13 21:36:16 +11:00
12b84307ac
specify upstream when pushing a branch for the first time
2019-11-11 23:30:30 +11:00
d0d92c7697
remove old add patch keybinding
2019-11-10 15:01:40 +11:00
72fe770974
better interface for ApplyPatch function
2019-11-05 19:22:01 +11:00
cd3874ffb7
don't let patch manager ever be nil
2019-11-05 19:22:01 +11:00
48347d4d86
use fallback approach for applying patch
2019-11-05 19:22:01 +11:00
0046e9c469
create backups of patch files in case something goes wrong
2019-11-05 19:22:01 +11:00
f285d80d0e
move PatchManager to GitCommand
2019-11-05 19:22:01 +11:00
1fc120de2d
better rebase args
2019-11-05 19:22:01 +11:00
d5e443e8e3
Support building and moving patches
...
WIP
2019-11-05 19:22:01 +11:00
820f3d5cbb
support split view in staging panel and staging ranges
2019-11-05 19:22:01 +11:00
827837b0b9
477 Remove unnecessary variable check
...
hasInlineMergeConflicts is always true with hasMergeConflicts is true
2019-07-27 11:05:23 +10:00
e83ef9858b
#477 Remove NeedMerge boolean
...
Instead of storing the status in a new variable, derive it from
the existing three fields
2019-07-27 11:05:23 +10:00
504d506575
477 Add new NeedReset property to File and update tests
...
Use a boolean to determin if a file needs to be reset. We want to reset
the file when discrading changes if there is a conflict.
2019-07-27 11:05:23 +10:00
823b436b53
477 Remove duplicate checkout
...
We already checout the file calling `c.DiscardUnstagedFileChanges`
2019-07-27 11:05:23 +10:00
212327d746
#477 Discard changes when there are merge conflicts
...
If there are merge conflicts, reset the file and discard all changes
2019-07-27 11:05:23 +10:00
cc138fc70e
Simplified boolean comparison
2019-07-27 10:55:21 +10:00
975a5315b0
Simplified code a bit
2019-07-27 10:52:06 +10:00
e1f5601d4b
fix typo
2019-07-14 14:24:59 +10:00
3e40369fd2
add GIT_OPTIONAL_LOCKS=0 env var to all commands
2019-06-06 20:53:35 +10:00
0f0fda1660
allow stashing staged changes
...
reinstate old stash functionality with the 's' keybinding
2019-06-06 20:50:19 +10:00
c61bfbdd4c
Support opening lazygit in a submodule
2019-05-12 17:59:49 +10:00
5a0d0bb299
support resetting to a commit in either soft, hard, or mixed mode
2019-05-06 22:44:38 +10:00
e09aac6450
Improve directory check for .git
...
Return error if the .git exists but is not a directory. This provides a
slightly better failure message for git repo with submodules in case
the '.git' is a file which provides the reference to the parent's .git
folder with the submodule inside.
2019-05-06 21:37:42 +10:00
ab9fa291a8
Add skipHookPrefix to config
...
allows a user to specify a commit message prefix that will tell lazygit to skip
the pre-commit hook. This defaults to WIP. Setting it to the empty string will
disable the feature.
So if my message goes 'WIP: do the thing' then the pre-commit hook will not run
2019-04-13 14:38:17 +10:00
fc3a57b5e2
Change expected sha for DiscardOldFileChanges
2019-04-10 17:17:31 +10:00
7ff07e1454
Always include atleast 2 commits when doing squash and fixup
2019-04-10 17:17:31 +10:00
60e33f5d8c
Allow for creating fixup! commits
2019-04-07 13:13:40 +10:00
c350cdba43
add feature of display diff between specific commits #397
2019-04-06 13:02:20 +11:00
acfc961909
move soft reset keybinding into reset options
2019-03-23 13:26:17 +11:00
f502f75e1f
add more options for resetting files in the working tree
2019-03-23 13:26:17 +11:00
ff97ef7b94
support discarding unstaged changes
2019-03-23 13:26:17 +11:00
f5c8aac97d
add two more tests
2019-03-16 10:20:27 +11:00
