github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 15:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: use --keep-non-patch flag with git am (#48797)

Browse Source
This commit is contained in:
David Sanders
2025-11-06 00:07:09 -08:00
committed by GitHub
parent f6ffb55c72
commit 3c100c2229
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
script/lib/git.py
View File

@@ -52,7 +52,8 @@ def get_repo_root(path):
def am(repo, patch_data, threeway=False, directory=None, exclude=None, def am(repo, patch_data, threeway=False, directory=None, exclude=None,
committer_name=None, committer_email=None, keep_cr=True): committer_name=None, committer_email=None, keep_cr=True):
args = [] # --keep-non-patch prevents stripping leading bracketed strings on the subject line
args = ['--keep-non-patch']
if threeway: if threeway:
args += ['--3way'] args += ['--3way']
if directory is not None: if directory is not None: