| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
|
|
|
|
Closes #5394.
|
|
|
|
The old variant broke with [1: 95ee9d8c51], which cannot be fixed simply
be reverting that commit, because it was in preparation of subsequent
changes, which heavily refactored section highlighting making it both
simpler and more generic, and also to improve performance. Delayed hunk
refinement conflicts with the former, and due to the latter it might not
be necessary anymore.
This commit does not fully restore the old behavior. Previously
delayed refinement meant that only the current hunk was ever refined;
when another section became current, the refinement of the previously
current section was removed again. Now, once a hunk has been refined,
it remains refined, until the buffer is refreshed.
The reason any form of delayed hunk refinement was implemented in the
first place, was to avoid the upfront cost of completely refining a
large diff. I never considered this a desirable feature; just a kludge
that was sadly necessary for performance reasons. IMO the new behavior
is an improvement; though always refining all hunks is of course even
better, unless it is too slow of course.
Closes #5385.
1: 2025-04-26 95ee9d8c5102bc5619f0e2c6d50104cae17b2009
magit-diff-paint-hunk: Only refine if actually painting
|
|
|
|
|
|
|
|
|
|
This counters Org commit 39264d3d41213085502dc0c2572f50855ea587a1.
|
|
|
|
Co-authored-by: Jonas Bernoulli <jonas@bernoul.li>
|
|
|
|
|
|
|
|
|
|
|
|
Use the term "dissolve" because that makes it clear that the branch that
is being merged is also deleted afterwards. Also change the key binding
in the `magit-merge' menu, to keep it mnemonic. At least the latter was
planned since [1: 4c096921fd]. Do not define `magit-merge-into' as an
obsolete alias, since that would prolong the period during which some
users would by take by surprise.
Re #4386.
1: 2021-07-01 4c096921fda97ebdff656a35a257910fca9e5aad
magit-merge: Change magit-merge-into's description
|
|
|
|
|
|
|
|
|
|
|
|
Closes #5308.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
In [1: 83d89ee5bb] we did speed up Magit's part in this task, but also
removed optimization used to speed up Git's part. Bring those back.
Also respect all local values of `status.showUntrackedFiles' again.
Closes #5298.
1: 2025-01-27 83d89ee5bb1c488544bae60d52f7ee1987b6449e
Speed up and simplify listing files in status buffer
|
|
|
|
|
|
|
|
|
|
We do call `git commit' with arguments, just not with `--message'.
|
|
|
|
|
|
Rearrange their definitions and the order in which they are described
in the manual, to better mirror their new arrangement in the menu.
|
|
- Bind "A" to `magit-commit-alter'. Previously that was bound to
`magit-commit-augment', but the new command is more similar to
`magit-commit-amend', whose binding is "a". `amend' and `alter' do
the approximately same thing, but the former is limited to the "HEAD"
commit. Additionally `alter' needs changes (else use `revise').
- Bind "W" to `magit-commit-revise' because "w" is bound to
`magit-commit-reword' and these two are also HEAD/any variants.
- Bind "n" to `magit-commit-augment'. The mnemonic being that this
adds a "note", which we later have to take into account when writing
the final commit message.
- Bind "d" to `magit-commit-reshelve' because "n" is now taken. Use
"d" because it changes dates. This command is disabled by default.
- In the menu, arrange the variants in a way that hopefully makes
these relations more obvious. Unfortunately this is not possible
without leaving some "table cells" empty.
|
|
Several fine commands dedicated to amending exist, and have
been preferable to this prefix argument for many years now.
|
|
|
|
Previously the meanings of "normal" and "all" were inverted. Now "all"
means "show all untracked" files, just like for `git status'. "normal"
means "show untracked files and directories", but while in the case of
`git status' that means that individual non-top-level files are never
shown, in our case directory sections can be expanded on demand to show
them when needed.
|
|
Be more verbose about the available fallback methods and also let
the user abort.
Re #5253.
|
|
|
