diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-29 11:08:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-29 11:08:09 -0700 |
| commit | 56173d28a5fb811c9525a8d5052ab6d83a07122e (patch) | |
| tree | d3a0dba51a0e6760184c4ffd7e4f2f9bdf23b8f8 /contrib/persistent-https/socket.go | |
| parent | 0f57f731ea2a540a4c82b476054e8a36aebb2314 (diff) | |
| parent | 3d946165e1177905103a25aeb374e018c510e540 (diff) | |
| download | git-56173d28a5fb811c9525a8d5052ab6d83a07122e.tar.gz git-56173d28a5fb811c9525a8d5052ab6d83a07122e.zip | |
Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff
* pw/rebase-keep-empty-fixes:
rebase: respect --no-keep-empty
rebase -i --keep-empty: don't prune empty commits
rebase --root: stop assuming squash_onto is unset
Git 2.16.2
Diffstat (limited to 'contrib/persistent-https/socket.go')
0 files changed, 0 insertions, 0 deletions