diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:44 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:44 -0400 |
| commit | b1e3dd68ee5e078b04d26da78df81eeb601e0837 (patch) | |
| tree | a0a34da888b617647c39f1cb7f8d69380f31a363 /diff.c | |
| parent | Merge branch 'ds/bundle-uri-3' (diff) | |
| parent | merge-tree: support multiple batched merges with --stdin (diff) | |
| download | git-b1e3dd68ee5e078b04d26da78df81eeb601e0837.tar.gz git-b1e3dd68ee5e078b04d26da78df81eeb601e0837.zip | |
Merge branch 'en/merge-tree-sequence'
"git merge-tree --stdin" is a new way to request a series of merges
and report the merge results.
* en/merge-tree-sequence:
merge-tree: support multiple batched merges with --stdin
merge-tree: update documentation for differences in -z output
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions