mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
Merge branch 'jc/rerere-train-modernise'
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:
commit
50e0dd8fee
|
@ -86,7 +86,7 @@ do
|
|||
fi
|
||||
if test -s "$GIT_DIR/MERGE_RR"
|
||||
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 checkout -q $commit -- .
|
||||
git rerere
|
||||
|
|
Loading…
Reference in a new issue