| commit | 332936124125014b4a6bb4606d8acf71cea55c3e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Mar 2010 08:32:59 +0000 (15 01:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Mar 2010 08:32:59 +0000 (15 01:32 -0700) | ||
| tree | 871172e0b25ac7d3a69b6ab9dddd2716fed919f7 | treesnapshot (tar.gz zip) |
| parent | f51da300bbb266ba0716a6441a8998f8cc3062f6 | commitdiff |
| parent | 66d681998411e8e5034080d5267a5e0f6cdc0c17 | commitdiff |
Merge branch 'tr/notes-display' into next
* tr/notes-display:
git-notes(1): add a section about the meaning of history
notes: track whether notes_trees were changed at all
notes: add shorthand --ref to override GIT_NOTES_REF
commit --amend: copy notes to the new commit
rebase: support automatic notes copying
notes: implement helpers needed for note copying during rewrite
notes: implement 'git notes copy --stdin'
rebase -i: invoke post-rewrite hook
rebase: invoke post-rewrite hook
commit --amend: invoke post-rewrite hook
Documentation: document post-rewrite hook
Support showing notes from more than one notes tree
test-lib: unset GIT_NOTES_REF to stop it from influencing tests
Conflicts:
git-am.sh
refs.c
* tr/notes-display:
git-notes(1): add a section about the meaning of history
notes: track whether notes_trees were changed at all
notes: add shorthand --ref to override GIT_NOTES_REF
commit --amend: copy notes to the new commit
rebase: support automatic notes copying
notes: implement helpers needed for note copying during rewrite
notes: implement 'git notes copy --stdin'
rebase -i: invoke post-rewrite hook
rebase: invoke post-rewrite hook
commit --amend: invoke post-rewrite hook
Documentation: document post-rewrite hook
Support showing notes from more than one notes tree
test-lib: unset GIT_NOTES_REF to stop it from influencing tests
Conflicts:
git-am.sh
refs.c
15 files changed: