git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-01 02:53:51 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge remote-tracking branch 'origin/master' into rebase-to-v2.21.0

Browse Source 
We accepted a Pull Request into `master`, but the main development
happens on the topic branch `rebase-to-v2.21.0` right now, in
preparation for the final v2.21.0 in a couple of days.

So after we forward-ported the changes in a6567c7b2c (Merge pull
request #2077 from r1walz/gzip-cmd-404, 2019-02-20), it is now time to
pull in the commit history of origin/master in a fake merge (i.e. with
`-s ours`), to make `master` fast-forward to `rebase-to-v2.21.0` again.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2019-02-21 11:02:12 +01:00
parent 35ee755a8c ed2b22adeb
commit c7d5d9dcf0
Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available