Skip to content

Generalization of the `.git/MERGE_MSG' path #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Generalization of the `.git/MERGE_MSG' path #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ciq-cherry-pick.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import argparse
import os
import subprocess
import git
from ciq_helpers import CIQ_cherry_pick_commit_standardization
from ciq_helpers import CIQ_original_commit_author_to_tag_string
# from ciq_helpers import *

MERGE_MSG = '.git/MERGE_MSG'
MERGE_MSG = git.Repo(os.getcwd()).git_dir + '/MERGE_MSG'

if __name__ == '__main__':
print("CIQ custom cherry picker")
Expand Down