121 Commits

Author	SHA1	Message	Date
Jesse Duffield	65d6d7fb2d	fix ignore file keybinding	2022-11-30 19:36:35 +11:00
Ryooooooga	52a2e4c1dc	fix: fix ambiguous branch name ... test: add an integration test for checkout branch by name fix: fix full ref name of detached head refactor: refactor current branch loader chore: use field name explicitly	2022-11-14 19:05:07 +11:00
Jesse Duffield	b33ec5a050	Merge pull request #1980 from ajhynes7/stash-untracked-changes	2022-11-14 18:46:53 +11:00
sudoburt	3e73dacce3	Merge loaders package into git_commands package	2022-11-14 18:11:45 +11:00
Andrew Hynes	684d1e955e	lint: try deleting blank line	2022-11-13 19:51:30 -03:30
Andrew Hynes	3c436b3457	lint: delete unused argument from handleStashSave	2022-11-13 11:02:06 -03:30
Jesse Duffield	d26350502c	stop switching focus to commits view when resetting	2022-11-13 03:26:50 +00:00
Andrew Hynes	a47e72892a	Merge branch 'master' into stash-untracked-changes	2022-11-01 16:08:34 -02:30
Ryooooooga	3103398e31	chore: refactor rename stash	2022-10-16 09:30:04 +09:00
Ryooooooga	eceb3a5aa6	chore: refactor rename stash	2022-10-16 09:12:43 +09:00
Ryooooooga	11316b7a48	feat: add rename stash	2022-10-16 09:12:42 +09:00
Andrew Hynes	8c46a0110d	Merge branch 'master' into stash-untracked-changes	2022-10-06 22:59:06 -02:30
jiepeng	bc8050d8ac	typo	2022-09-17 15:10:41 -07:00
jiepeng	b8900baf1a	remove deprecated calls	2022-09-17 15:10:41 -07:00
Andrew Hynes	e189546acb	refactor: move checks for clean working tree	2022-09-15 21:48:49 -02:30
Andrew Hynes	c7733aa5e5	refactor: rename method to StashIncludeUntrackedChanges	2022-09-15 21:48:49 -02:30
Andrew Hynes	50cf7ac5bc	refactor: change command order	2022-09-15 21:48:49 -02:30
Andrew Hynes	c7fd218308	fix: add condition to if statement	2022-09-15 21:48:49 -02:30
Andrew Hynes	7ddb80a13e	feat: add stash option to include untracked changes	2022-09-15 21:48:48 -02:30
Luka Markušić	0ff5b74d80	IgnoreOrExclude should be a menu	2022-08-11 14:23:02 +02:00
Jesse Duffield	7410acd1aa	move merge conflicts code into controller	2022-08-07 11:16:03 +10:00
Jesse Duffield	445a625b56	rename merging context to mergeConflicts	2022-08-06 18:05:00 +10:00
Jesse Duffield	524bf83a4a	refactor to only have one context per view	2022-08-06 13:49:11 +10:00
Jesse Duffield	debc58b6c5	fix popup focus issue	2022-08-01 22:09:48 +10:00
Jesse Duffield	682be18507	refactor to use generics for file nodes ... use less generic names	2022-07-31 19:43:14 +10:00
Jesse Duffield	7077ea428f	add optimistic rendering for staging and unstaging files	2022-07-31 14:34:57 +10:00
Jesse Duffield	95678b1b43	Merge pull request #2065 from jesseduffield/fix-rewording-merge-commit-with-editor ... Fix rewording a merge commit with editor	2022-07-30 19:51:59 +10:00
Luka Markušić	cc377b5c49	Fix rewording a merge commit with editor	2022-07-30 08:43:42 +02:00
Luka Markušić	1f482e585e	Fix github linter errors	2022-07-30 08:10:29 +02:00
Juan Sanchez Montalvo	11d766053e	Allow adding a file to the .git/info/exclude file	2022-07-05 19:33:44 +10:00
Jesse Duffield	cdec70cc06	Merge pull request #1975 from mark2185/fix-unmatching-remote-branch-name	2022-06-09 20:12:56 +10:00
Jesse Duffield	9591cc381a	support setting the author of a commit ... update copy	2022-06-09 19:12:20 +10:00
Luka Markušić	55a941d5dc	Fetch the correct remote branch	2022-06-01 20:35:09 +02:00
Ryooooooga	9693afd671	fix: fix lint error	2022-05-18 20:34:35 +09:00
Jesse Duffield	f31dcd3091	Merge pull request #1930 from mark2185/feature/discard-staged-only	2022-05-15 20:33:25 +10:00
Luka Markušić	241d182da7	Make tooltip i18n-able	2022-05-15 12:16:20 +02:00
Ryooooooga	61970a4439	fix: fix ambiguous refname	2022-05-13 21:05:51 +09:00
Luka Markušić	ca191159f5	Discard staged changes only	2022-05-08 14:24:28 +02:00
Jesse Duffield	6f8063217d	rename displayString to label for menu items	2022-05-08 14:26:18 +10:00
Jens Pfeifle	7c573a5bea	Add command to reset the commit author from the commits panel.	2022-05-08 13:29:56 +10:00
Jesse Duffield	f257740ea7	add tooltip view for showing menu item descriptions	2022-05-08 13:24:36 +10:00
Jesse Duffield	0940e0182b	Merge pull request #1870 from mark2185/feature/stash-unstaged	2022-05-06 20:17:33 +10:00
Jesse Duffield	f7fae0b82e	Merge pull request #1869 from mark2185/feature/unset-upstream	2022-05-06 20:14:13 +10:00
Jesse Duffield	4dd09ee0d5	allow copying commit author to clipboard	2022-05-01 14:14:29 +10:00
Jesse Duffield	e68093fe99	add scrollbars	2022-04-16 17:29:17 +10:00
Luka Markušić	1ae2dc9941	The four horsemen of stashing	2022-04-14 21:45:55 +02:00
Luka Markušić	e114b5b5e8	Refresh BRANCHES and COMMITS after (un)staging upstream	2022-04-13 15:54:32 +02:00
Luka Markušić	c4b958e3fd	There's gotta be a better way for initial content	2022-04-13 15:21:01 +02:00
Luka Markušić	f83308c8df	Add option to (un)set upstream for a local branch	2022-04-11 14:04:06 +02:00
Luka Markušić	6f7038c827	Add option to stash only unstaged files	2022-04-10 09:35:59 +02:00