Jesse Duffield 37d9ed6712 test script to make repo with a merge conflict

2018-07-21 15:57:54 +10:00

test

test script to make repo with a merge conflict

2018-07-21 15:57:54 +10:00

.gitignore

better handling of branches and untracked files

2018-07-21 15:51:18 +10:00

branches_panel.go

better handling of branches and untracked files

2018-07-21 15:51:18 +10:00

commits_panel.go

add support for merging

2018-06-09 19:06:33 +10:00

confirmation_panel.go

add support for merging

2018-06-09 19:06:33 +10:00

files_panel.go

refreshing files if there's an error while pulling because chances are it's a merge conflict

2018-07-21 15:57:23 +10:00

gitcommands.go

better handling of branches and untracked files

2018-07-21 15:51:18 +10:00

gui.go

better handling of branches and untracked files

2018-07-21 15:51:18 +10:00

main.go

better handling of branches and untracked files

2018-07-21 15:51:18 +10:00

merge_panel.go

fix up code that was used to test this very application (yes I'm ashamed)

2018-07-21 15:53:52 +10:00

newFile

better handling of branches and untracked files

2018-07-21 15:51:18 +10:00

newFile2

better handling of branches and untracked files

2018-07-21 15:51:18 +10:00

stash_panel.go

better handling of branches and untracked files

2018-07-21 15:51:18 +10:00

status_panel.go

add support for merging

2018-06-09 19:06:33 +10:00

view_helpers.go

better handling of branches and untracked files

2018-07-21 15:51:18 +10:00

Description

simple terminal UI for git commands ComputerSurge Style

MIT 189 MiB

Languages

Go 99.7%

Shell 0.2%