diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:06:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:06:53 -0800 |
| commit | 8f31355692f33944e9c1240de8b175c43f857de1 (patch) | |
| tree | 3d0ee0537996b6712a7b23beb0cbc6f5b9209eaf /Documentation/git-merge-file.txt | |
| parent | 90abc19b5ab53a49018a1beff0b3df260daa38e4 (diff) | |
| parent | 64912a67a43dec151906b93f96b07f16e17f71e9 (diff) | |
| download | git-8f31355692f33944e9c1240de8b175c43f857de1.tar.gz git-8f31355692f33944e9c1240de8b175c43f857de1.tar.xz | |
Merge branch 'mv/apply-parse-opt'
* mv/apply-parse-opt:
Resurrect "git apply --flags -" to read from the standard input
parse-opt: migrate builtin-apply.
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions