aboutsummaryrefslogtreecommitdiff
path: root/lisp/magit-merge.el
AgeCommit message (Expand)Author
2026-03-29Make Cond-Let's when$ availableJonas Bernoulli
2026-02-21magit-merge-{plain,editmsg,nocommit}: Support creating octopus mergesJonas Bernoulli
2026-02-21magit-merge-editmsg: CosmeticsJonas Bernoulli
2026-01-01Improve indentation of interactiveJonas Bernoulli
2026-01-01Bump copyright yearsJonas Bernoulli
2025-11-05Drop a space from autoload cookiesJonas Bernoulli
2025-08-22Avoid t condition in final match-all cond clauseJonas Bernoulli
2025-08-22Use cond-let and cond-let*Jonas Bernoulli
2025-08-22Use Cond-Let's implementations of {if,when,and,while}-let{,*}Jonas Bernoulli
2025-08-01magit-completing-read: Support requiring non-empty inputJonas Bernoulli
2025-07-25Use shorthand match-str instead of match-string-no-propertiesJonas Bernoulli
2025-04-22magit--merge-absorb: Add MESSAGE argumentJonas Bernoulli
2025-04-22magit-merge-dissolve: Avoid duplicating workJonas Bernoulli
2025-04-22magit-get-local-upstream-branch: New functionJonas Bernoulli
2025-03-25magit-merge-into: Rename to magit-merge-dissolve and change bindingJonas Bernoulli
2025-01-31magit:--gpg-sign: Set default level via prototypeJonas Bernoulli
2025-01-31magit:--signoff: Set default level via prototypeJonas Bernoulli
2025-01-30Make --signoff available in more menusJonas Bernoulli
2025-01-01Bump copyright yearsJonas Bernoulli
2024-06-23Use string-join instead of mapconcatJonas Bernoulli
2024-04-28magit-log-section: Set keymap slotJonas Bernoulli
2024-04-15Update contact informationJonas Bernoulli
2024-01-01Bump copyright yearsJonas Bernoulli
2023-05-01magit-checkout-read-stage: Respect magit-verbose-messagesJonas Bernoulli
2023-03-18Show errors inline in log buffersJonas Bernoulli
2023-03-17Deprecate magit-git-dir to avoid needlessly repeating workJonas Bernoulli
2023-02-13Use defvar-keymap from Emacs 29.1 or the Compat packageJonas Bernoulli
2023-01-03Bump copyright yearsJonas Bernoulli
2022-04-22Refresh library headersJonas Bernoulli
2022-04-22Use pcase's quote upatternJonas Bernoulli
2022-04-22Use and-let* for side-effectsJonas Bernoulli
2022-03-25Increase use of section type, keymap and binding inheritanceJonas Bernoulli
2022-02-16magit-discard-files: Account for 'renamed on both sides' conflictsKyle Meyer
2022-01-01Bump copyright yearsJonas Bernoulli
2021-11-12magit-merge-into: Fix doc-string typoJonas Bernoulli
2021-08-09magit-merge: Add -Xignore-space-change and -Xignore-all-spaceJonas Bernoulli
2021-07-01magit-merge: Change magit-merge-into's descriptionJonas Bernoulli
2021-05-25Add SPDX-License-Identifier library headerJonas Bernoulli
2021-01-24No longer hard-code name of main branchJonas Bernoulli
2021-01-24Load essential core libraries upfrontJonas Bernoulli
2021-01-03Bump copyright yearsJonas Bernoulli
2020-12-05magit-{merge,rebase}: Add --strategy-optionJonas Bernoulli
2020-09-01magit-merge: Fix argument for diff algorithmSimon Pintarelli
2020-06-01magit-merge-into: Support merging detached HEADJonas Bernoulli
2020-05-16Adjust to renamed Transient macros and variablesJonas Bernoulli
2020-04-18magit--merge-absorb-1: Prefix number with number signJonas Bernoulli
2020-03-03magit-rebase: Add --strategy argumentJonas Bernoulli
2020-01-02Update copyright yearsJonas Bernoulli
2019-11-10magit-merge: Add --Xdiff-algorithmJonas Bernoulli
2019-06-24magit-merge-{absorb,into}: Append pullreq number if appropriateJonas Bernoulli
generated by cgit v1.0 at 2026-05-27 05:32:09 +0000