builtin/merge.c: drop a parameter that is never used
[gitweb.git] / notes.c
2013-06-26 Merge branch 'mm/push-force-is-dangerous'
2013-06-26 Merge branch 'fg/submodule-non-ascii-path'
2013-06-24 Merge branch 'rr/am-quit-empty-then-abort-fix'
2013-06-24 Merge branch 'rt/cherry-pick-continue-advice-in-status'
2013-06-24 Merge branch 'nk/config-local-doc'
2013-06-24 Merge branch 'jk/mergetool-lib-refactor'
2013-06-24 Merge branch 'jk/doc-build-move-infordir-def'
2013-06-24 Merge branch 'dk/version-gen-gitdir'
2013-06-24 Merge branch 'dk/maint-t5150-dirname'
2013-06-24 Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
2013-06-24 Merge branch 'mm/rm-coalesce-errors'
2013-06-24 Merge branch 'jh/libify-note-handling'
2013-06-24 Merge branch 'fc/sequencer-plug-leak'
2013-06-23 Merge branch 'mz/rebase-tests'
2013-06-23 Merge branch 'jk/unpack-entry-fallback-to-another'
2013-06-23 Merge branch 'jk/apache-test-for-2.4'
2013-06-23 Merge branch 'rr/rebase-autostash'
2013-06-23 Merge branch 'rr/prompt-rebase-breakage-fix'
2013-06-23 Merge branch 'jg/status-config'
2013-06-21 Sync with maint
2013-06-20 Merge branch 'cm/remote-mediawiki'
2013-06-20 Merge branch 'rs/match-trees-refactor'
2013-06-20 Merge branch 'rs/logical-vs-binary-or'
2013-06-20 Merge branch 'mm/color-auto-default'
2013-06-20 Merge branch 'rs/discard-index-discard-array'
2013-06-20 Merge branch 'nd/traces'
2013-06-20 Merge branch 'fc/show-non-empty-errors-in-test'
2013-06-20 Merge branch 'fc/makefile'
2013-06-20 Merge branch 'js/test-ln-s-add'
2013-06-20 Merge branch 'nd/make-wildmatch-default'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-06-14 Merge branch 'rr/complete-difftool-fixup'
2013-06-14 Merge branch 'mt/send-email-cc-match-fix'
2013-06-14 Merge branch 'bp/mediawiki-credential'
2013-06-14 Merge branch 'mh/reflife'
2013-06-11 Merge branch 'rr/maint-fetch-tag-doc-asterisks'
2013-06-11 Merge branch 'cr/git-work-tree-sans-git-dir'
2013-06-11 Merge branch 'fc/do-not-use-the-index-in-add-to-index'
2013-06-02 Merge branch 'mk/combine-diff-context-horizon-fix'
2013-06-02 string_list_add_refs_by_glob(): add a comment about...
2013-06-02 string_list_add_one_ref(): rename first parameter to...
2013-05-29 Merge branch 'jk/lookup-object-prefer-latest'
2013-05-29 Merge branch 'as/check-ignore'
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint
2013-05-01 Merge branch 'hb/git-pm-tempfile'
2013-04-26 Merge branch 'ph/rebase-original'
2013-04-24 Merge branch 'sr/log-SG-no-textconv' into maint
2013-04-24 Merge branch 'jc/merge-tag-object' into maint
2013-04-22 Merge branch 'jc/detached-head-doc' into maint
2013-04-22 Merge branch 'jk/show-branch-strbuf' into maint
2013-04-22 Merge branch 'js/rerere-forget-protect-against-NUL...
2013-04-22 Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint
2013-04-22 Merge branch 'jk/filter-branch-come-back-to-original...
2013-04-19 Merge branch 'tr/copy-revisions-from-stdin'
2013-04-18 Merge branch 'jc/detached-head-doc'
2013-04-15 Merge branch 'jk/show-branch-strbuf'
2013-04-12 Merge branch 'jk/diffcore-break-divzero' into maint
2013-04-12 Merge branch 'cn/commit-amend-doc' into maint
2013-04-12 Merge branch 'jk/bisect-prn-unsigned' into maint
2013-04-12 Merge branch 'tb/document-status-u-tradeoff' into maint
2013-04-12 Merge branch 'sr/log-SG-no-textconv'
2013-04-12 Merge branch 'js/rerere-forget-protect-against-NUL'
2013-04-07 Merge branch 'cn/commit-amend-doc'
2013-04-07 Merge branch 'jk/diffcore-break-divzero'
2013-04-07 Merge branch 'jk/bisect-prn-unsigned'
2013-04-07 Merge branch 'jk/filter-branch-come-back-to-original'
2013-04-05 Merge branch 'jc/merge-tag-object'
2013-04-04 Merge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04 Merge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04 Merge branch 'jk/peel-ref' into maint
2013-04-03 Merge branch 'jc/apply-ws-fix-tab-in-indent'
2013-04-03 Merge branch 'ks/rfc2047-one-char-at-a-time' into maint
2013-04-03 Merge branch 'lf/setup-prefix-pathspec' into maint
2013-04-03 Merge branch 'kb/name-hash' into maint-1.8.1
2013-04-03 Merge branch 'kk/revwalk-slop-too-many-commit-within...
2013-04-03 Merge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03 Merge branch 'jk/fully-peeled-packed-ref' into maint...
2013-04-03 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03 Merge branch 'jc/perl-cat-blob' into maint-1.8.1
2013-04-03 Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-03 Merge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-04-02 Merge branch 'sw/safe-create-leading-dir-race'
2013-04-01 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-01 Merge branch 'rr/tests-dedup-test-config' into maint
2013-04-01 Merge branch 'tb/document-status-u-tradeoff' into maint
2013-04-01 Merge branch 'nd/index-pack-threaded-fixes'
2013-04-01 Merge branch 'jk/index-pack-correct-depth-fix'
2013-04-01 Merge branch 'jc/remove-export-from-config-mak-in'
2013-04-01 Merge branch 'kb/name-hash'
2013-03-28 Merge branch 'kk/revwalk-slop-too-many-commit-within...
2013-03-28 Merge branch 'rr/tests-dedup-test-config'
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28 Merge branch 'jk/checkout-attribute-lookup'
2013-03-26 Merge branch 'jc/reflog-reverse-walk'
2013-03-26 Merge branch 'jk/utf-8-can-be-spelled-differently'...
2013-03-26 Merge branch 'jc/perl-cat-blob' into maint
2013-03-26 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-03-26 Merge branch 'nd/index-pack-l10n-buf-overflow' into...
next