2731 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jesse Duffield	2b37c9b19c	ensure current branch is on top of the branch list	2018-08-07 19:26:47 +10:00
Jesse Duffield	c8bacb4186	refactor	2018-08-07 19:23:02 +10:00
Jesse Duffield	a1aa031252	revert to using bash instead of sh	2018-08-07 19:20:27 +10:00
Jesse Duffield	c4f3637e21	better function name	2018-08-07 19:16:54 +10:00
Jesse Duffield	6cf6fecb64	refactor getting branches	2018-08-07 19:13:41 +10:00
Jesse Duffield	b541987007	fixup	2018-08-07 18:37:48 +10:00
Jesse Duffield	2d4801c39d	merge updated keybinding structure	2018-08-07 18:14:49 +10:00
Jesse Duffield	7fe54e889d	merge master	2018-08-07 18:13:45 +10:00
Jesse Duffield	f6a9c727fa	run subprocess cleanly	2018-08-07 18:05:43 +10:00
Jesse Duffield	f8ca0ddcad	Update README.md	2018-08-07 17:55:02 +10:00
Jesse Duffield	138f40d7ae	Merge branch 'master' into feature/use-dep	2018-08-07 17:12:37 +10:00
Jesse Duffield	b80e8111c6	Update README.md	2018-08-07 15:50:56 +10:00
Jesse Duffield	6df4a3ff41	merge windows support hotfix	2018-08-07 15:45:04 +10:00
Jesse Duffield	a70753364c	platform specific shell usage	2018-08-07 15:21:50 +10:00
Jesse Duffield	948f6a1f7a	return on error when merging branches	2018-08-07 14:43:43 +10:00
Jesse Duffield	46fb4c5f0a	swap out bash command for a git one	2018-08-07 14:23:10 +10:00
Jesse Duffield	e23ed80eaa	use git branch when merging branches	2018-08-07 14:10:15 +10:00
Jesse Duffield	ab03902d08	return on error when merging branches	2018-08-07 14:08:56 +10:00
Jesse Duffield	9bfaa9f62c	Merge branch 'master' into hotfix/windows-support	2018-08-07 14:05:08 +10:00
Jesse Duffield	28caaf6f1c	invert platform check	2018-08-07 14:01:41 +10:00
Jesse Duffield	384d2e3c83	use sh instead of bash	2018-08-07 13:44:00 +10:00
Jesse Duffield	a4f4a16237	fix panel outlines for windows	2018-08-07 13:31:45 +10:00
Jesse Duffield	a4a975a69c	don't panic on no files when pressing d	2018-08-07 12:51:03 +10:00
Jesse Duffield	6985e52949	handle error from git log that arises from lack of tracking	2018-08-07 12:49:31 +10:00
Jesse Duffield	eabf07248a	Merge branch 'master' into feature/use-dep	2018-08-07 12:31:51 +10:00
Jesse Duffield	ba9485ae57	support more merge conflict headers	2018-08-07 10:41:14 +10:00
Jesse Duffield	236eabb811	support Updated upstream message in merge panel	2018-08-07 10:39:49 +10:00
Jesse Duffield	f11edda6a2	limit commits in graph output for performance	2018-08-07 10:09:29 +10:00
Jesse Duffield	7fb77418cc	refactor keybindings	2018-08-07 09:54:07 +10:00
Jesse Duffield	dcf87e2765	Merge pull request #50 from robthr/patch-1 ... Added macOS installation note (from #43)	2018-08-07 09:38:22 +10:00
Malcolm Robinson	90e488d5a4	Added macOS installation note (from #43)	2018-08-07 09:34:45 +10:00
Jesse Duffield	31f6ef1c29	Merge pull request #40 from jukefr/patch-1 ... add p (pull) and P (push)	2018-08-07 08:29:03 +10:00
Jesse Duffield	c6ab935779	make push keybinding more explicit	2018-08-07 08:27:08 +10:00
Jesse Duffield	9c2e1dfc6e	Merge pull request #47 from karlmutch/master ... Modified reference to HEAD in one case, others appear to exist for ra…	2018-08-07 08:26:15 +10:00
Karl Mutch	16e3d5f092	Modified reference to HEAD in one case, others appear to exist for ranges but I am not familiar enough with these.	2018-08-06 13:30:21 -07:00
Kevin Jullien	7dc4878e0b	add p (pull) and P (push)	2018-08-06 17:18:03 +02:00
Jesse Duffield	694b192b74	fix incorrect checked out branch display	2018-08-07 00:41:59 +10:00
Jesse Duffield	9e5c04d57d	Update README.md	2018-08-07 00:08:54 +10:00
Jesse Duffield	91ecf1e499	Update README.md	2018-08-07 00:07:42 +10:00
Jesse Duffield	7e5d7bfe38	fix windows bash conditional error	2018-08-06 23:53:28 +10:00
Jesse Duffield	9067c3be3e	handling file edit	2018-08-06 23:29:00 +10:00
Jesse Duffield	fc2e3a5316	Merge pull request #36 from tomyfalgui/patch-1 ... Swapped incorrect cli keywords	2018-08-06 23:03:37 +10:00
Tomas Alejandro V. Falgui III	17cf4cec31	Switched incorrect cli keywords	2018-08-06 20:53:17 +08:00
Jesse Duffield	69378b8ff4	add documentation comment about osx scrolling	2018-08-06 21:47:46 +10:00
Jesse Duffield	fbc09e2093	add keybindings doc to readme	2018-08-06 21:35:30 +10:00
Jesse Duffield	afc3d4a997	add keybindings doc	2018-08-06 21:32:43 +10:00
Jesse Duffield	caea649733	remove old comment	2018-08-06 21:14:01 +10:00
Jesse Duffield	a02d3a0c4e	show graph when selecting branch in branch panel	2018-08-06 21:13:52 +10:00
Jesse Duffield	3ee9687540	Merge pull request #20 from dawidd6/master ... Add installation instructions for ubuntu	2018-08-06 20:38:35 +10:00
Jesse Duffield	15f982daae	Merge branch 'master' into feature/use-dep	2018-08-06 19:11:53 +10:00