diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:15:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:15:59 -0800 |
| commit | 1cb3ed308dcfaa6084b8aed075c772aeb9e57243 (patch) | |
| tree | 75a9536e7071b4785887ef6c251be09df45d46d9 /trace.c | |
| parent | 017565525f969c26c43443d998a1283cac843d10 (diff) | |
| parent | b3715b75226668e26f1f2abe7e2f93cdbbf6e2f5 (diff) | |
| download | git-1cb3ed308dcfaa6084b8aed075c772aeb9e57243.tar.gz git-1cb3ed308dcfaa6084b8aed075c772aeb9e57243.tar.xz | |
Merge branch 'jk/notes-merge-from-anywhere'
"git notes merge" used to limit the source of the merged notes tree
to somewhere under refs/notes/ hierarchy, which was too limiting
when inventing a workflow to exchange notes with remote
repositories using remote-tracking notes trees (located in e.g.
refs/remote-notes/ or somesuch).
* jk/notes-merge-from-anywhere:
notes: allow merging from arbitrary references
Diffstat (limited to 'trace.c')
0 files changed, 0 insertions, 0 deletions