Stefan Haller
227b0b781c
Show update-ref commands in rebase todo list
...
This is useful when working with stacked branches, because you can now move
"pick" entries across an update-ref command and you can tell exactly which
branch the commit will end up in.
It's also useful to spot situations where the --update-refs option didn't work
as desired. For example, if you duplicate a branch and want to rebase only one
of the branches but not the other (maybe for testing); if you have
rebase.updateRefs=true in your git config, then rebasing one branch will move
the other branch along. To solve this we'll have to introduce a way to delete
the update-ref entry (maybe by hitting backspace?); this is out of scope for
this PR, so for now users will have to type "git rebase --edit-todo" into the
custom command prompt to sort this out.
We will also have to prevent users from trying to turn update-ref commands into
other commands like "pick" or "drop"; we'll do this later in this branch.
2023-04-15 08:36:03 +02:00
Jesse Duffield
60f902f026
rename patch manager to patch builder
2023-03-19 16:35:57 +11:00
Jesse Duffield
73c7dc9c5d
refactor patch code
2023-03-19 16:30:39 +11:00
stk
5bb6198219
Allow ignoring whitespace in diff in commits panel
2023-02-07 12:14:29 +01:00
Jesse Duffield
d73a236d7c
allow rendering to main panels from anywhere
2022-08-07 12:05:51 +10:00
Jesse Duffield
524bf83a4a
refactor to only have one context per view
2022-08-06 13:49:11 +10:00
Jesse Duffield
371b8d638b
more consistent naming
2022-03-17 19:13:40 +11:00
Jesse Duffield
b93b8cc00a
controller for viewing sub commits
2022-03-17 19:13:40 +11:00
Jesse Duffield
d82f175e79
refactor contexts
2022-03-17 19:13:40 +11:00
Jesse Duffield
2a1e3faa0c
resetting controllers on new repo
2022-03-17 19:13:40 +11:00
Jesse Duffield
51547e3822
move all refresh code into the one file
2022-03-17 19:13:40 +11:00
Jesse Duffield
e363606fb6
move context keys into context package
2022-03-17 19:13:40 +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
a90b6efded
start refactoring gui
2022-03-17 19:13:40 +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
ca7cfc3232
only show commits from start ref if bad commit is reachable from there
2022-01-26 16:52:20 +11:00
glendsoza
eb57e3ead0
Fixed the issue with linting
2022-01-26 09:04:12 +11:00
glendsoza
0caa391c4d
Changes as per review
2022-01-26 09:04:12 +11:00
glendsoza
0c6bdac2f7
Changes as per review
2022-01-26 09:04:12 +11:00
glendsoza
257e222f8d
ISSUE 1706: Ask confirmation before reverting a commit
2022-01-26 09:04:12 +11:00
Jesse Duffield
4ab5e54139
add support for git bisect
2022-01-22 10:48:51 +11:00
Jesse Duffield
e5096e71ab
add integration test for discarding old files
2022-01-09 14:14:47 +11:00
Jesse Duffield
0dfd02c42d
allow rewording old commits
2022-01-09 14:14:47 +11:00
Jesse Duffield
18f48a43d5
add some more linters
2022-01-09 14:09:53 +11:00
Jesse Duffield
364c5db19c
shorten name
2022-01-09 14:09:53 +11:00
Jesse Duffield
946a35b59d
remove OSCommand field
2022-01-09 14:09:53 +11:00
Jesse Duffield
f503ff1ecb
start breaking up git struct
2022-01-09 14:09:53 +11:00
Jesse Duffield
93729ba61b
fix some things
2022-01-07 10:52:51 +11:00
Jesse Duffield
91fe68576c
refactor
2022-01-07 10:52:51 +11:00
Jesse Duffield
05fa483f48
simplify how we log commands
2022-01-07 10:52:51 +11:00
Jesse Duffield
194ff1630c
do dependency injection up front and in one place
2022-01-04 09:07:15 +11:00
Jesse Duffield
9b2b0fc122
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
96c2887fd0
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
66e840bc3f
more refactoring
2022-01-04 09:07:15 +11:00
Jesse Duffield
43a4fa970d
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
01ea5813a8
align Gui struct with GitCommand
2022-01-04 09:07:15 +11:00
Jesse Duffield
b4c078d565
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
9ef65574db
refactor to rename pull_request to hosting_service and apply SRP
2021-12-29 09:01:06 +11:00
Jesse Duffield
f89747451a
allow opening a commit in the browser
2021-12-29 09:01:06 +11:00
Francisco Miamoto
8c8b925b3a
set tag index directly
...
We can do this since they are already sorted by date created.
2021-12-26 17:08:31 +11:00
Francisco Miamoto
eff6c4283b
change formatting for menu items
2021-12-26 17:08:31 +11:00
Francisco Miamoto
7888ff6cb9
set show cancel as true for tag menu
2021-12-26 17:08:31 +11:00
Francisco Miamoto
e7a005f44d
update translations to match conventions
2021-12-26 17:08:31 +11:00
Francisco Miamoto
3e58797096
show tag menu for creation on tags tab
2021-12-26 17:08:31 +11:00
Francisco Miamoto
b1d6ccddfb
support creating annotated tags
2021-12-26 17:08:31 +11:00
Jesse Duffield
1996eddd91
more efficient context diff size changing
2021-12-06 22:37:28 +11:00
Jesse Duffield
ccd80a0e4b
add menu options for log stuff
2021-11-05 07:58:21 +11:00
Jesse Duffield
802cfb1a04
render commit graph
2021-11-05 07:58:21 +11:00
Jesse Duffield
2fc1498517
some refactoring in anticipation of the graph feature
2021-11-01 10:03:49 +11:00
Jesse Duffield
fb395bca6e
support reverting merge commits
2021-06-05 22:15:51 +10:00
