diff options
| author | David Chen <weichen2000121@gmail.com> | 2020-01-07 00:03:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 00:03:49 +0800 |
| commit | 983379d334a949cca4301a994ec8b3c89cb4d617 (patch) | |
| tree | d7a726dde9be5410d9c059e46ca27ec3514a9ed6 | |
| parent | fd72a09d1e622566654ef4f2e3b1df7aeab60f12 (diff) | |
| parent | 818134247ddcde74d7d33c534c7696c9481f3028 (diff) | |
Merge branch 'master' into custom-keybindings
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | pkg/commands/git.go | 2 |
2 files changed, 1 insertions, 11 deletions
@@ -48,22 +48,12 @@ sudo port install lazygit Packages for Ubuntu are available via [Launchpad PPA](https://launchpad.net/~lazygit-team). -**Release builds** - ```sh sudo add-apt-repository ppa:lazygit-team/release sudo apt-get update sudo apt-get install lazygit ``` -**Development builds** - -```sh -sudo add-apt-repository ppa:lazygit-team/daily -sudo apt-get update -sudo apt-get install lazygit -``` - ### Void Linux Packages for Void Linux are available in the distro repo diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 7bcc651cb..08eb78edf 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -628,7 +628,7 @@ func (c *GitCommand) Diff(file *File, plain bool, cached bool) string { func (c *GitCommand) ApplyPatch(patch string, flags ...string) error { c.Log.Warn(patch) - filepath := filepath.Join(c.Config.GetUserConfigDir(), utils.GetCurrentRepoName(), time.Now().Format(time.StampNano)+".patch") + filepath := filepath.Join(c.Config.GetUserConfigDir(), utils.GetCurrentRepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch") if err := c.OSCommand.CreateFileWithContent(filepath, patch); err != nil { return err } |