branch: elpa/git-commit
commit 16316ed16d7eac48c045f5ed6a26ad437abbec93
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
magit-merge: Add -Xignore-space-change and -Xignore-all-space
Closes #4387.
---
Documentation/RelNotes/3.3.0.org | 4 ++++
lisp/magit-merge.el | 2 ++
2 files changed, 6 insertions(+)
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
diff --git a/lisp/magit-merge.el b/lisp/magit-merge.el
index a50ca3d..e1457e2 100644
--- a/lisp/magit-merge.el
+++ b/lisp/magit-merge.el
@@ -47,6 +47,8 @@
("-n" "No fast-forward" "--no-ff")
(magit-merge:--strategy)
(5 magit-merge:--strategy-option)
+ (5 "-b" "Ignore changes in amount of whitespace" "-Xignore-space-change")
+ (5 "-w" "Ignore whitespace when comparing lines" "-Xignore-all-space")
(5 magit-diff:--diff-algorithm :argument "-Xdiff-algorithm=")
(5 magit:--gpg-sign)]
["Actions"
