undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/rerere-train-modernise'

Browse Source 
Small modernization of the rerere-train script (in contrib/).

* jc/rerere-train-modernise:
  rerere-train: two fixes to the use of "git show -s"
This commit is contained in:
Junio C Hamano 2022-03-06 21:25:30 -08:00
commit 50e0dd8fee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/rerere-train.sh
View File

@ -86,7 +86,7 @@ do
fi fi
if test -s "$GIT_DIR/MERGE_RR" if test -s "$GIT_DIR/MERGE_RR"
then then
git show -s --pretty=format:"Learning from %h %s" "$commit" git --no-pager show -s --format="Learning from %h %s" "$commit"
git rerere git rerere
git checkout -q $commit -- . git checkout -q $commit -- .
git rerere git rerere