aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2021-08-09 20:25:57 +0200
committerJonas Bernoulli <jonas@bernoul.li>2021-08-09 20:25:57 +0200
commit16316ed16d7eac48c045f5ed6a26ad437abbec93 (patch)
tree332d4a868fd6be2b9796301583dbe279be40f08e /Documentation
parent14ae9f6d9016d8ced2cc8daad949a73b150c2f13 (diff)
magit-merge: Add -Xignore-space-change and -Xignore-all-space
Closes #4387.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/3.3.0.org4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/RelNotes/3.3.0.org b/Documentation/RelNotes/3.3.0.org
index 25df55f..0fc3075 100644
--- a/Documentation/RelNotes/3.3.0.org
+++ b/Documentation/RelNotes/3.3.0.org
@@ -11,6 +11,10 @@
or have a numeric value can now also be enabled without having
an explicit numeric value. #4379
+- Added ~-Xignore-space-change~ and ~-Xignore-all-space~ to ~magit-merge~.
+ Like most newly added expert arguments they have to be explicitly
+ [[https://magit.vc/manual/transient/Enabling-and-Disabling-Suffixes.html][revealed]]. #4387
+
** Fixes since v3.2.0
- Make ~magit-branch-remote-head~ and ~magit-branch-current~ fall back