mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-02-13 13:59:06 +02:00
Merge branch 'master' into custom-keybindings
This commit is contained in:
commit
983379d334
10
README.md
10
README.md
@ -48,22 +48,12 @@ sudo port install lazygit
|
|||||||
|
|
||||||
Packages for Ubuntu are available via [Launchpad PPA](https://launchpad.net/~lazygit-team).
|
Packages for Ubuntu are available via [Launchpad PPA](https://launchpad.net/~lazygit-team).
|
||||||
|
|
||||||
**Release builds**
|
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
sudo add-apt-repository ppa:lazygit-team/release
|
sudo add-apt-repository ppa:lazygit-team/release
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install lazygit
|
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
|
### Void Linux
|
||||||
|
|
||||||
Packages for Void Linux are available in the distro repo
|
Packages for Void Linux are available in the distro repo
|
||||||
|
@ -628,7 +628,7 @@ func (c *GitCommand) Diff(file *File, plain bool, cached bool) string {
|
|||||||
|
|
||||||
func (c *GitCommand) ApplyPatch(patch string, flags ...string) error {
|
func (c *GitCommand) ApplyPatch(patch string, flags ...string) error {
|
||||||
c.Log.Warn(patch)
|
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 {
|
if err := c.OSCommand.CreateFileWithContent(filepath, patch); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user