Giorgio Previtera 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

..

testdata

Support opening lazygit in a submodule

2019-05-12 17:59:49 +10:00

branch.go

fix typo

2019-07-14 14:24:59 +10:00

commit_file.go

minor cleanup

2019-03-16 10:20:27 +11:00

commit.go

fixed some #397

2019-04-06 13:02:20 +11:00

dummies.go

fix up tests

2019-03-02 13:39:09 +11:00

errors.go

allow user to discard old file changes for a given commit

2019-03-16 10:20:27 +11:00

exec_live_default.go

add GIT_OPTIONAL_LOCKS=0 env var to all commands

2019-06-06 20:53:35 +10:00

exec_live_win.go

pkg: Fix typo

2019-01-16 18:06:11 +11:00

file.go

allow stashing staged changes

2019-06-06 20:50:19 +10:00

git_structs.go

color merged and unmerged commits differently

2018-09-18 21:45:35 +10:00

git_test.go

allow stashing staged changes

2019-06-06 20:50:19 +10:00

git.go

#477 Discard changes when there are merge conflicts

2019-07-27 11:05:23 +10:00

os_default_platform.go

windows support for skipping the editor

2019-03-03 12:44:10 +11:00

os_test.go

fix up tests

2019-03-02 13:39:09 +11:00

os_windows.go

refactor: move fallback to platform struct

2018-09-10 10:31:15 +02:00

os.go

add GIT_OPTIONAL_LOCKS=0 env var to all commands

2019-06-06 20:53:35 +10:00

pull_request_test.go

Update bitbucket pull request url.

2019-03-16 11:58:26 +11:00

pull_request.go

Update bitbucket pull request url.

2019-03-16 11:58:26 +11:00

stash_entry.go

fix typo

2019-07-14 14:24:59 +10:00