]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0175655 b3715b7)
Merge branch 'jk/notes-merge-from-anywhere'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Feb 2016 22:15:59 +0000 (14:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Feb 2016 22:15:59 +0000 (14:15 -0800)
commit1cb3ed308dcfaa6084b8aed075c772aeb9e57243
tree75a9536e7071b4785887ef6c251be09df45d46d9tree | snapshot
parent017565525f969c26c43443d998a1283cac843d10commit | diff
parentb3715b75226668e26f1f2abe7e2f93cdbbf6e2f5commit | diff
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
builtin/notes.c diff1 | diff2 | blob | history
notes.c diff1 | diff2 | blob | history
notes.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.