Jesse Duffield 954dfb12e4 Merge branch 'master' into feature/auto-updates		2018-08-20 19:53:53 +10:00
..
app	WIP auto updates	2018-08-20 19:52:20 +10:00
commands	popup force push confirmation panel if the local branch has diverged from the upstream branch	2018-08-19 21:28:13 +10:00
config	bump dependencies	2018-08-18 14:20:19 +10:00
git	more robust reading of reflog to get branch name	2018-08-15 09:45:24 +10:00
gui	Merge branch 'master' into feature/auto-updates	2018-08-20 19:53:53 +10:00
i18n	Merge pull request #188 from jesseduffield/feature/force-push	2018-08-20 19:52:41 +10:00
test	add test for variety of potential git diff situations	2018-08-19 14:48:39 +10:00
updates	WIP auto updates	2018-08-20 19:52:20 +10:00
utils	remove test	2018-08-19 21:39:23 +02:00