diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-27 11:50:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-27 11:50:45 -0700 |
| commit | 1958ad504befa6a09c475cc8ab9de43b359de137 (patch) | |
| tree | 900dd4eebc62b31355313e18b3bd4fee4ef02600 /Documentation/git-merge-one-file.txt | |
| parent | Git 2.19 (diff) | |
| parent | Git 2.18.1 (diff) | |
| download | tgif-1958ad504befa6a09c475cc8ab9de43b359de137.tar.xz | |
Sync with 2.18.1
* maint-2.18:
Git 2.18.1
Git 2.17.2
fsck: detect submodule paths starting with dash
fsck: detect submodule urls starting with dash
Git 2.16.5
Git 2.15.3
Git 2.14.5
submodule-config: ban submodule paths that start with a dash
submodule-config: ban submodule urls that start with dash
submodule--helper: use "--" to signal end of clone options
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions