mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-06-23 00:39:13 +02:00
Merge pull request #7 from jesseduffield/master
Update to latest master
This commit is contained in:
14
README.md
14
README.md
@ -28,7 +28,19 @@ brew install lazygit
|
|||||||
### Ubuntu
|
### Ubuntu
|
||||||
Packages for Ubuntu 16.04, 18.04 and 18.10 are available via [Launchpad PPA](https://launchpad.net/~lazygit-team).
|
Packages for Ubuntu 16.04, 18.04 and 18.10 are available via [Launchpad PPA](https://launchpad.net/~lazygit-team).
|
||||||
|
|
||||||
They are built daily, straight from master branch.
|
**Release builds**
|
||||||
|
|
||||||
|
Built from git tags. Supposed to be more stable.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo add-apt-repository ppa:lazygit-team/release
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install lazygit
|
||||||
|
```
|
||||||
|
|
||||||
|
**Daily builds**
|
||||||
|
|
||||||
|
Built from master branch once in 24 hours (or more sometimes).
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
sudo add-apt-repository ppa:lazygit-team/daily
|
sudo add-apt-repository ppa:lazygit-team/daily
|
||||||
|
@ -359,7 +359,7 @@ func (c *GitCommand) IsInMergeState() (bool, error) {
|
|||||||
func (c *GitCommand) RemoveFile(file File) error {
|
func (c *GitCommand) RemoveFile(file File) error {
|
||||||
// if the file isn't tracked, we assume you want to delete it
|
// if the file isn't tracked, we assume you want to delete it
|
||||||
if !file.Tracked {
|
if !file.Tracked {
|
||||||
return c.OSCommand.RunCommand("rm -rf ./" + file.Name)
|
return os.RemoveAll(file.Name)
|
||||||
}
|
}
|
||||||
// if the file is tracked, we assume you want to just check it out
|
// if the file is tracked, we assume you want to just check it out
|
||||||
return c.OSCommand.RunCommand("git checkout " + file.Name)
|
return c.OSCommand.RunCommand("git checkout " + file.Name)
|
||||||
|
Reference in New Issue
Block a user