RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-22 04:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCRIPTS: git-show-backports: emit the shell command to backport a commit

Browse Source 
It's cumbersome to copy-paste a commit ID into another window after having
typed "git cherry-pick -sx", so let's have the suggested output format of
git-show prepare this line just before the subject line, it remains at a
stable position on the terminal when searching for "/^commit". One just
has to copy-paste the line into another terminal will result in the commit
being properly picked.
This commit is contained in:
Willy Tarreau 2020-07-31 16:47:44 +02:00
parent f456f6f2a3
commit 1f927d1bc2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/git-show-backports
View File

@ -251,13 +251,13 @@ dump_commit_matrix | column -t | \
echo
echo
echo "In order to show and/or apply all leftmost commits to current branch :"
echo " git show ${left_commits[@]}"
echo " git show --pretty=format:'%C(yellow)commit %H%C(normal)%nAuthor: %an <%ae>%nDate: %aD%n%n%C(green)%C(bold)git cherry-pick -sx %h%n%n%w(72,4,4)%B%N' ${left_commits[@]}"
echo
echo " git cherry-pick -sx ${left_commits[@]}"
echo
if [ "${left_commits[*]}" != "${right_commits[*]}" ]; then
echo "In order to show and/or apply all rightmost commits to current branch :"
echo " git show ${right_commits[@]}"
echo " git show --pretty=format:'%C(yellow)commit %H%C(normal)%nAuthor: %an <%ae>%nDate: %aD%n%n%C(green)%C(bold)git cherry-pick -sx %h%n%n%w(72,4,4)%B%N' ${right_commits[@]}"
echo
echo " git cherry-pick -sx ${right_commits[@]}"
echo