diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-07 08:25:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-07 08:25:30 +0300 |
| commit | 50e0dd8fee3828adafc27fc7c0a5262137577ddf (patch) | |
| tree | 49af14540e60173b53851de4efffc6642c03835d /contrib | |
| parent | e82874700174223d17bf3673874e6175840becc4 (diff) | |
| parent | 2587df669bff9daeb7d2a66cfce6b1ce28af2ef3 (diff) | |
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"
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/rerere-train.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh index 75125d6ae0..26b724c8c6 100755 --- a/contrib/rerere-train.sh +++ b/contrib/rerere-train.sh @@ -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 |