Junio C Hamano a86ed83cce Merge branch 'tr/notes-display' ... * 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		2010-03-24 16:26:43 -07:00
..
add.c	Merge branch 'cp/add-u-pathspec'	2010-03-10 15:32:02 -08:00
annotate.c
apply.c	Merge branch 'bg/apply-fix-blank-at-eof'	2010-03-20 11:29:35 -07:00
archive.c
bisect--helper.c
blame.c	Merge branch 'maint'	2010-03-13 21:31:42 -08:00
branch.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
bundle.c
cat-file.c
check-attr.c
check-ref-format.c
checkout-index.c
checkout.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
clean.c
clone.c	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
commit-tree.c
commit.c	Merge branch 'tr/notes-display'	2010-03-24 16:26:43 -07:00
config.c
count-objects.c
describe.c
diff-files.c
diff-index.c
diff-tree.c	Merge branch 'pb/log-first-parent-p-m'	2010-03-24 16:25:39 -07:00
diff.c
fast-export.c
fetch-pack.c
fetch.c	Merge branch 'maint'	2010-03-20 11:29:19 -07:00
fmt-merge-msg.c
for-each-ref.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
fsck.c
gc.c
grep.c	Merge branch 'ml/color-grep'	2010-03-20 11:29:36 -07:00
hash-object.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
help.c
index-pack.c
init-db.c	Merge branch 'sd/init-template'	2010-03-10 15:32:43 -08:00
log.c	Merge branch 'tr/notes-display'	2010-03-24 16:26:43 -07:00
ls-files.c
ls-remote.c
ls-tree.c
mailinfo.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
mailsplit.c	Merge branch 'sh/am-keep-cr'	2010-03-10 15:32:34 -08:00
merge-base.c
merge-file.c	Merge branch 'bw/union-merge-refactor'	2010-03-20 11:29:34 -07:00
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c
mktag.c
mktree.c
mv.c
name-rev.c
notes.c	Merge branch 'tr/notes-display'	2010-03-24 16:26:43 -07:00
pack-objects.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
push.c	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
read-tree.c
receive-pack.c
reflog.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
remote.c
replace.c
rerere.c
reset.c	Merge branch 'cc/reset-keep'	2010-03-20 11:29:35 -07:00
rev-list.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
rev-parse.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
revert.c
rm.c
send-pack.c	Merge branch 'ld/push-porcelain'	2010-03-15 00:58:24 -07:00
shortlog.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
show-branch.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
show-ref.c
stripspace.c
symbolic-ref.c
tag.c
tar-tree.c
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-archive.c
var.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
verify-pack.c
verify-tag.c
write-tree.c