projects
/
gimrr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
963141b
)
git-mr-merge: include MR base in the merge commit
author
Frantisek Hrbata
<frantisek@hrbata.com>
Fri, 18 Dec 2020 14:52:18 +0000
(15:52 +0100)
committer
Frantisek Hrbata
<frantisek@hrbata.com>
Fri, 18 Dec 2020 14:52:18 +0000
(15:52 +0100)
Signed-off-by: Frantisek Hrbata <frantisek@hrbata.com>
git-mr-merge
patch
|
blob
|
history
diff --git
a/git-mr-merge
b/git-mr-merge
index 4d45b61c4e9ddb626a125c6d50a9de3fefe867e1..688fedb17c015afbac6c0d3d996f2bd71464039d 100755
(executable)
--- a/
git-mr-merge
+++ b/
git-mr-merge
@@
-51,6
+51,7
@@
msgfn = "{}/msg".format(tmpdir.name)
with open(msgfn, "a+") as f:
f.write(subj)
f.write("\n\n")
+ f.write("MR base: {}\n\n".format(base))
f.write(desc)
if not args.force: