Andrew Hynes
8c46a0110d
Merge branch 'master' into stash-untracked-changes
2022-10-06 22:59:06 -02:30
Luka Markušić
41f86f6535
Rebase merges by default
2022-09-24 23:37:17 +02:00
jiepeng
b8900baf1a
remove deprecated calls
2022-09-17 15:10:41 -07:00
Andrew Hynes
c7733aa5e5
refactor: rename method to StashIncludeUntrackedChanges
2022-09-15 21:48:49 -02:30
Andrew Hynes
6feb301c2a
fix: use message in git stash command
2022-09-15 21:48:49 -02:30
Andrew Hynes
e66b162726
refactor: remove redundant if statement
2022-09-15 21:48:49 -02:30
Andrew Hynes
4f8816ebf2
refactor: use extended flag name
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
nullishamy
154bd975a6
Apply refactoring suggestions
2022-08-15 13:59:34 +01:00
Jesse Duffield
755ae0ef84
add deadlock mutex package
...
write to deadlock stderr after closing gocui
more deadlock checking
2022-08-07 11:16:14 +10:00
Jesse Duffield
524bf83a4a
refactor to only have one context per view
2022-08-06 13:49:11 +10:00
Jesse Duffield
86ac309e08
add build info when building from source
2022-08-01 20:16:50 +10: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
9591cc381a
support setting the author of a commit
...
update copy
2022-06-09 19:12:20 +10:00
Luka Markušić
ca191159f5
Discard staged changes only
2022-05-08 14:24:28 +02:00
Jens Pfeifle
fbe23b3754
fixup! Add command to reset the commit author from the commits panel.
2022-05-08 13:29:57 +10:00
Jens Pfeifle
7ac487545c
fixup! Add command to reset the commit author from the commits panel.
2022-05-08 13:29:56 +10:00
Jens Pfeifle
7c573a5bea
Add command to reset the commit author from the commits panel.
2022-05-08 13:29:56 +10:00
Ryooooooga
5717e72366
fix: fix copying author name to clipboard
2022-05-07 18:08:05 +09:00
Jesse Duffield
cd5b041b0f
clearer separation of concerns when bootstrapping application
2022-05-07 16:02:04 +10:00
Ryooooooga
d458e78d95
feat: add ability to edit hunk
2022-05-06 21:53:00 +09: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
Ryooooooga
e5730cb80b
fix: improve default editCommandTemplate
2022-04-23 17:39:12 +09:00
Luka Markušić
bd9daf80b7
Add integration tests
2022-04-17 11:08:36 +02:00
Luka Markušić
1ae2dc9941
The four horsemen of stashing
2022-04-14 21:45:55 +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
Ryooooooga
53257db99d
fix: fix diff of renamed files
2022-04-06 08:26:13 +10:00
Ryooooooga
99ecc1cfdf
fix loaders
2022-04-02 17:04:42 +11:00
Ryooooooga
86c259623c
feat: fix permission problem of temp dirs
2022-04-02 08:48:38 +11:00
Luka Markušić
540edb0bf4
Add copy commit attributes option
2022-03-26 17:22:42 +11:00
Jesse Duffield
43d3f2bcb6
refactor todo file generation
2022-03-24 20:14:41 +11:00
Jesse Duffield
99e55725fb
simplify
2022-03-24 20:14:41 +11:00
Jesse Duffield
bf4f06ab4e
more generics
2022-03-24 20:14:41 +11:00
Jesse Duffield
c7a629c440
make more use of generics
2022-03-24 20:14:41 +11:00
Moritz Haase
8fb47fb7d6
pkg/commands: Don't duplicate line breaks when retrieving commit message
...
When using the "copy commit message to clipboard" action, the message will end
up in the clipboard with duplicate line breaks. The same issue also affects the
"Reword Commit" command. GetCommitMessage(), the function used to retrieve the
commit message first splits the output returned by git into separate lines -
without removing the line breaks. After removing the first line (which contains
the commit SHA), it joins the lines of the message itself back together - adding
a second set of line breaks along the way. Stop this from happening.
Fixes #1808 .
2022-03-23 08:19:17 +11:00
Jesse Duffield
a34bdf1a04
update linters
2022-03-19 12:12:57 +11:00
Jesse Duffield
1dd7307fde
start moving commit panel handlers into controller
...
more
and more
move rebase commit refreshing into existing abstraction
and more
and more
WIP
and more
handling clicks
properly fix merge conflicts
update cheatsheet
lots more preparation to start moving things into controllers
WIP
better typing
expand on remotes controller
moving more code into controllers
2022-03-17 19:13:40 +11:00
Jesse Duffield
f53b10072d
open code in existing window
2022-03-16 19:55:58 +11:00
Jesse Duffield
11acac0091
more explicit
2022-03-16 19:55:58 +11:00
Luka Markušić
866f4b9f0e
Support line offset for most common editors by default
2022-03-16 19:55:58 +11:00
Jesse Duffield
5a3f81d1f7
select current bisect commit even if bisect was started on another branch
2022-01-26 19:29:17 +11:00
Jesse Duffield
5e6e1617aa
add another bisect integration test
2022-01-26 16:52:20 +11:00
Jesse Duffield
ca7cfc3232
only show commits from start ref if bad commit is reachable from there
2022-01-26 16:52:20 +11:00
Jesse Duffield
dc765c4166
add a file close that was missed
2022-01-26 14:50:47 +11:00
Jesse Duffield
c8cc18920f
improve merge conflict flow
2022-01-26 14:50:47 +11:00
Jesse Duffield
5b7dd9e43c
properly resolve cyclic dependency
2022-01-22 10:48:51 +11:00
Jesse Duffield
4ab5e54139
add support for git bisect
2022-01-22 10:48:51 +11:00
