Merge branch 'jk/notes-merge-config'
[git/git.git] / builtin / notes.c
2015-08-31 Junio C HamanoMerge branch 'jk/notes-merge-config'
2015-08-31 Junio C HamanoMerge branch 'jc/am-state-fix'
2015-08-31 Junio C HamanoMerge branch 'jc/log-p-cc'
2015-08-31 Junio C HamanoMerge branch 'jk/fix-alias-pager-config-key-warnings'
2015-08-31 Junio C HamanoMerge branch 'jk/rev-list-has-no-notes'
2015-08-31 Junio C HamanoMerge branch 'hv/submodule-config'
2015-08-31 Junio C HamanoMerge branch 'sg/config-name-only'
2015-08-28 Junio C HamanoSync with 2.5.1
2015-08-28 Junio C HamanoMerge branch 'cc/trailers-corner-case-fix'
2015-08-28 Junio C HamanoMerge branch 'dt/untracked-subdir'
2015-08-26 Junio C HamanoMerge branch 'sg/help-group'
2015-08-26 Junio C HamanoMerge branch 'sg/wt-status-header-inclusion'
2015-08-26 Junio C HamanoMerge branch 'as/docfix-reflog-expire-unreachable'
2015-08-26 Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-08-26 Junio C HamanoMerge branch 'jc/calloc-pathspec'
2015-08-26 Junio C HamanoMerge branch 'dt/untracked-sparse'
2015-08-26 Junio C HamanoMerge branch 'pt/am-builtin'
2015-08-26 Junio C HamanoMerge branch 'pt/am-builtin-abort-fix'
2015-08-26 Junio C HamanoMerge branch 'po/po-readme'
2015-08-26 Junio C HamanoMerge branch 'jv/send-email-selective-smtp-auth'
2015-08-26 Junio C HamanoMerge branch 'ep/http-configure-ssl-version'
2015-08-26 Junio C HamanoMerge branch 'ss/fix-config-fd-leak'
2015-08-25 Junio C HamanoSync with maint
2015-08-25 Junio C HamanoMerge branch 'cb/open-noatime-clear-errno'
2015-08-25 Junio C HamanoMerge branch 'mh/tempfile'
2015-08-25 Junio C HamanoMerge branch 'pt/am-builtin-options'
2015-08-25 Junio C HamanoMerge branch 'dt/refs-pseudo'
2015-08-25 Junio C HamanoMerge branch 'dt/notes-multiple'
2015-08-25 Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full'
2015-08-19 Junio C HamanoMerge branch 'jc/finalize-temp-file'
2015-08-19 Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-19 Junio C HamanoMerge branch 'kn/tag-doc-fix' into maint
2015-08-19 Junio C HamanoMerge branch 'es/doc-clean-outdated-tools' into maint
2015-08-19 Junio C HamanoMerge branch 'nd/export-worktree' into maint
2015-08-19 Junio C HamanoMerge branch 'se/doc-checkout-ours-theirs' into maint
2015-08-19 Junio C HamanoMerge branch 'as/sparse-checkout-removal' into maint
2015-08-19 Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head...
2015-08-17 Jacob Kellernotes: teach git-notes about notes.<name>.mergeStrategy...
2015-08-17 Jacob Kellernotes: add notes.mergeStrategy option to select default...
2015-08-17 Jacob Kellernotes: extract parse_notes_merge_strategy to notes...
2015-08-17 Junio C HamanoMerge branch 'mh/get-remote-group-fix'
2015-08-12 Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add'
2015-08-12 Junio C HamanoMerge branch 'dt/unpack-trees-cache-tree-revalidate'
2015-08-12 Junio C HamanoMerge branch 'es/worktree-add-cleanup'
2015-08-12 Junio C HamanoMerge branch 'es/worktree-add'
2015-08-11 David Turnernotes: handle multiple worktrees
2015-08-03 Junio C HamanoMerge branch 'es/doc-clean-outdated-tools'
2015-08-03 Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head'
2015-08-03 Junio C HamanoMerge branch 'as/sparse-checkout-removal'
2015-08-03 Junio C HamanoMerge branch 'se/doc-checkout-ours-theirs'
2015-08-03 Junio C HamanoMerge branch 'kn/tag-doc-fix'
2015-08-03 Junio C HamanoMerge branch 'jc/commit-slab'
2015-08-03 Junio C HamanoMerge branch 'nd/export-worktree'
2015-08-03 Junio C HamanoMerge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-08-03 Junio C HamanoMerge branch 'sg/completion-commit-cleanup' into maint
2015-08-03 Junio C HamanoMerge branch 'pt/am-abort-fix' into maint
2015-08-03 Junio C HamanoMerge branch 'mh/reporting-broken-refs-from-for-each...
2015-08-03 Junio C HamanoMerge branch 'sg/commit-cleanup-scissors' into maint
2015-07-27 Junio C HamanoMerge branch 'jk/pretty-encoding-doc' into maint
2015-07-27 Junio C HamanoMerge branch 'mm/branch-doc-updates' into maint
2015-07-27 Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh' into maint
2015-07-27 Junio C HamanoMerge branch 'jc/unexport-git-pager-in-use-in-pager...
2015-07-27 Junio C HamanoMerge branch 'jk/rev-list-no-bitmap-while-pruning'...
2015-07-27 Junio C HamanoMerge branch 'rh/test-color-avoid-terminfo-in-original...
2015-07-27 Junio C HamanoMerge branch 'jk/fix-refresh-utime' into maint
2015-07-27 Junio C HamanoMerge branch 'cb/rebase-am-exit-code' into maint
2015-07-27 Junio C HamanoMerge branch 'jk/index-pack-reduce-recheck' into maint
2015-07-21 Junio C HamanoMerge branch 'tf/gitweb-typofix'
2015-07-17 Junio C HamanoMerge branch 'jk/still-interesting'
2015-07-17 Junio C HamanoMerge branch 'es/worktree-add'
2015-07-15 Junio C HamanoMerge branch 'jc/diff-ws-error-highlight'
2015-07-15 Junio C HamanoMerge branch 'mm/describe-doc' into maint
2015-07-15 Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15 Junio C HamanoMerge branch 'es/osx-header-pollutes-mask-macro' into...
2015-07-15 Junio C HamanoMerge branch 'es/utf8-stupid-compiler-workaround' into...
2015-07-15 Junio C HamanoMerge branch 'fk/doc-format-patch-vn' into maint
2015-07-15 Junio C HamanoMerge branch 'pt/t0302-needs-sanity' into maint
2015-07-15 Junio C HamanoMerge branch 'me/fetch-into-shallow-safety' into maint
2015-07-15 Junio C HamanoMerge branch 'af/tcsh-completion-noclobber' into maint
2015-07-15 Junio C HamanoMerge branch 'pa/auto-gc-mac-osx' into maint
2015-07-15 Junio C HamanoMerge branch 'jc/do-not-feed-tags-to-clear-commit-marks...
2015-07-13 Junio C HamanoMerge branch 'es/worktree-add'
2015-07-13 Junio C HamanoMerge branch 'nd/multiple-work-trees'
2015-07-13 Junio C HamanoMerge branch 'jc/unexport-git-pager-in-use-in-pager'
2015-07-13 Junio C HamanoMerge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-07-13 Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh'
2015-07-10 Junio C HamanoMerge branch 'cb/rebase-am-exit-code'
2015-07-10 Junio C HamanoMerge branch 'jk/fix-refresh-utime'
2015-07-10 Junio C HamanoMerge branch 'mm/branch-doc-updates'
2015-07-10 Junio C HamanoMerge branch 'jk/rev-list-no-bitmap-while-pruning'
2015-07-10 Junio C HamanoMerge branch 'rh/test-color-avoid-terminfo-in-original...
2015-07-10 Junio C HamanoMerge branch 'jk/pretty-encoding-doc'
2015-07-09 Junio C HamanoMerge branch 'jc/fix-alloc-sortbuf-in-index-pack'
2015-07-01 Junio C HamanoMerge branch 'me/fetch-into-shallow-safety'
2015-07-01 Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator'
2015-07-01 Junio C HamanoMerge branch 'mm/describe-doc'
2015-06-26 Junio C HamanoMerge branch 'jk/stash-require-clean-index' into maint
2015-06-26 Junio C HamanoMerge branch 'cb/array-size' into maint
2015-06-25 Junio C HamanoMerge branch 'cn/cvsimport-perl-update'
2015-06-25 Junio C HamanoMerge branch 'cb/array-size'
next