Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rav/disable_pager_in_ci' into rav/welcome_page

Browse Source
This commit is contained in:
Richard van der Hoff 2018-12-11 14:13:02 +00:00
commit bd52978fd7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/merge_base_branch.sh
View File

@ -20,7 +20,7 @@ else
fi fi
# Show what we are before # Show what we are before
git show -s git --no-pager show -s
# Set up username so it can do a merge # Set up username so it can do a merge
git config --global user.email bot@matrix.org git config --global user.email bot@matrix.org
@ -31,4 +31,4 @@ git fetch -u origin $GITBASE
git merge --no-edit origin/$GITBASE git merge --no-edit origin/$GITBASE
# Show what we are after. # Show what we are after.
git show -s git --no-pager show -s

1
changelog.d/4291.misc Normal file
View File

@ -0,0 +1 @@
Disable pager when running git-show in CI