Merge git://git.bogomips.org/git-svn

Junio C Hamano committed over 16 years ago

t9150,t9151: Add rewrite-root option to init

Tuomas Suutari committed over 16 years ago

git-svn: Fix merge detecting with rewrite-root

Tuomas Suutari committed over 16 years ago

git status: Fix false positive "new commits" output for dirty submodules

Jens Lehmann committed over 16 years ago

Refactor dirty submodule detection in diff-lib.c

Jens Lehmann committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

notes: rework subcommands and parse options

Stephen Boyd committed over 16 years ago

git-notes(1): add a section about the meaning of history

Thomas Rast committed over 16 years ago

notes: track whether notes_trees were changed at all

Thomas Rast committed over 16 years ago

notes: add shorthand --ref to override GIT_NOTES_REF

Thomas Rast committed over 16 years ago

commit --amend: copy notes to the new commit

Thomas Rast committed over 16 years ago

rebase: support automatic notes copying

Thomas Rast committed over 16 years ago

notes: implement helpers needed for note copying during rewrite

Thomas Rast committed over 16 years ago

notes: implement 'git notes copy --stdin'

Thomas Rast committed over 16 years ago

rebase -i: invoke post-rewrite hook

Thomas Rast committed over 16 years ago

rebase: invoke post-rewrite hook

Thomas Rast committed over 16 years ago

commit --amend: invoke post-rewrite hook

Thomas Rast committed over 16 years ago

Documentation: document post-rewrite hook

Thomas Rast committed over 16 years ago

Support showing notes from more than one notes tree

Thomas Rast committed over 16 years ago

test-lib: unset GIT_NOTES_REF to stop it from influencing tests

Thomas Rast committed over 16 years ago