| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
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.
|
|
|
|
|
|
Fix a typo in doc-string and copy additional information from
doc-string to manual.
|
|
|
|
|
|
|
|
|
|
The ecosystem isn't read; maybe in a few more years.
|
|
|
|
|
|
Emacs (and thus Org) on GNU ELPA build server is too old, so we have
to allow Org to continue when it encounters broken links. Users will
notice these broken links, but this way we at least get to distribute
the Magit manual.
The broken links are those that link to Git's man pages.
|
|
|
|
|
|
That also means that we can use the (updated) {{{version}}} macro again.
|
|
|
|
- Files are not the only inputs to `texi', so we cannot rely on their
modification times alone, to determine whether a rebuild is required.
The new `redo-docs' always regenerates the texi file and thus all
other formats. Use that target before publishing the manual.
- Teach `html-dir' to only regenerate if a texi file has actually been
touched.
- However when `html-dir' does regenerate, we must first remove all
existing html files, to avoid files that used to be generated but
are not being generated anymore, from sticking around.
|
|
The release was indeed tagged on the 8th,
but the announcement wasn't ready until the 9th.
|
|
|
|
|
|
magit-diff-range with a single revision and magit-diff-working-tree
both show a diff between the revision and the working tree. Whether
magit-reverse aborted in these buffers used to be determined by
whether the specified revision resolved to HEAD. If so, magit-reverse
aborted with "Cannot reverse unstaged changes".
magit-reverse aborting here wasn't entirely right because a diff of
HEAD versus the working tree may contain staged changes too.
e94b6ebf (Record diff-type in magit-diff-mode buffers, 2023-03-18)
moved magit-diff-range and magit-diff-working-tree in different
directions. With that change, magit-diff-range with any revision,
including HEAD, allows reversing. On the other hand,
magit-diff-working-tree with any revision forbids reversing.
Update magit-diff-working-tree to pass `committed' instead of
`unstaged' for the diff type. As a description, `committed' is a bit
off (the diff can include a mix of unstaged, staged, and committed
changes), but it allows reversing and matches what magit-diff-range
does.
For a diff of any revision against the working tree, magit-apply is
bound to fail. Before e94b6ebf, magit-apply used to abort when the
diff was between _HEAD_ and the working tree. After e94b6ebf and this
change, magit-apply leaves the failure to git-apply. To abort early,
we could mark working tree diffs with a distinct diff type, but
leaving the failure to apply time is good enough, at least for now.
Closes #5090.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Make them match the outline regexp we use.
|
|
Now that an Org version (9.6), which contains the necessary changes to
ox-texinfo, has been released, we assume that users have the necessary
tools.
|
|
Only when referring to the executable/command, do we use lower-case
git.
|
|
|
|
A prefix arg triggers the transient as of fd5b9ead
(magit-fetch-modules: With prefix argument act as transient prefix,
2021-12-01).
|
|
This variable was deleted in ed806783 (Remove variables and functions
obsolete since v3.3.0, 2023-03-13).
Re: #5144
|
|
This spot was missed in 943686e3 (Update descriptions of module
commands in manual, 2018-01-26).
|
|
|
|
|
|
- "strickly" -> "strictly"
- "stricktly" -> "strictly"
I change this because I find results on Google for "strictly" but not
"strick(t)ly".
|
|
|
