| Age | Commit message (Collapse) | Author |
|---|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
This is a refinement of the functionality, which was previously
enabled using the variable `magit-process-extreme-logging' (which
we remove).
|
|
Focus on documenting the command `magit-toggle-git-debug', at the
expense of the documentation for the variable `magit-git-debug',
which users don't really have to know about.
|
|
|
|
|
|
I wrote this a while ago in response to a user complaining that this
command never does what they mean (dwtm), and have finally decided to
install it after all, because, despite the slight saltiness towards
the end, this actually is useful information.
|
|
|
|
|
|
If we cannot successfully install the conflict with "git stash apply
--index", we also try "git stash apply", and if that fails as well,
we continue with "git apply --3way".
That assumed that we could tell whether a stash was either applied
with no conflict or the conflict was successfully installed by, or
else the conflict could not be installed, by checking status.
Unfortunately it turns out that the exit status is also 1 if the
conflict was successfully installed. Instead we have to look at
the output.
Unfortunately we can only do that for Git v2.38.0 and later, and
have to fall back to the less convenient behavior provided by Git
itself.
Closes #5253.
|
|
|
