resolve_gitlink_packed_ref(): fix mismerge
[gitweb.git] / kwset.h
2011-10-16 Merge git://repo.or.cz/git-gui
2011-10-16 Merge branch 'ms/patch-id-with-overlong-line' into...
2011-10-16 Merge branch 'jc/maint-bundle-too-quiet' into maint
2011-10-16 Merge branch 'jk/filter-branch-require-clean-work-tree...
2011-10-16 Merge branch 'jc/maint-fsck-fwrite-size-check' into...
2011-10-16 Merge branch 'bk/ancestry-path' into maint
2011-10-16 Merge branch 'jk/maint-fetch-submodule-check-fix' into...
2011-10-16 Merge branch 'tr/mergetool-valgrind' into maint
2011-10-16 Merge branch 'nm/grep-object-sha1-lock' into maint
2011-10-16 Merge branch 'jc/diff-index-unpack' into maint
2011-10-16 Merge branch 'mm/rebase-i-exec-edit' into maint
2011-10-16 Merge branch 'jc/maint-grep-untracked-exclude' into...
2011-10-14 Merge branch 'js/maint-merge-one-file-osx-expr'
2011-10-14 Merge branch 'jn/ident-from-etc-mailname'
2011-10-14 Merge branch 'il/archive-err-signal'
2011-10-14 Merge branch 'rs/diff-cleanup-records-fix'
2011-10-14 Merge branch 'rs/pending'
2011-10-14 Merge branch 'jc/is-url-simplify'
2011-10-14 Merge branch 'nd/git-daemon-error-msgs'
2011-10-14 Merge branch 'nd/daemon-log-sock-errors'
2011-10-14 Merge branch 'cp/git-web-browse-browsers'
2011-10-14 Merge branch 'jc/apply-blank-at-eof-fix'
2011-10-14 Merge branch 'di/fast-import-empty-tag-note-fix'
2011-10-14 Merge branch 'nd/maint-autofix-tag-in-head'
2011-10-14 Merge branch 'bw/grep-no-index-no-exclude'
2011-10-14 Merge branch 'nd/maint-sparse-errors'
2011-10-12 Merge branch 'sp/smart-http-failure'
2011-10-12 Merge branch 'nd/document-err-packet'
2011-10-12 Merge branch 'rs/test-ctype'
2011-10-12 Merge branch 'rs/name-rev-usage'
2011-10-12 Merge branch 'zj/send-email-authen-sasl'
2011-10-10 Merge branch 'dm/tree-walk'
2011-10-10 Merge branch 'ps/gitweb-js-with-lineno'
2011-10-10 Merge branch 'mh/maint-notes-merge-pathbuf-fix'
2011-10-10 Merge branch 'nd/sparse-doc'
2011-10-10 Merge branch 'jp/get-ref-dir-unsorted'
2011-10-10 Merge branch 'mh/iterate-refs'
2011-10-10 Merge branch 'jm/mergetool-pathspec'
2011-10-10 Merge branch 'jc/maint-diffstat-numstat-context'
2011-10-10 Merge branch 'mz/remote-rename'
2011-10-10 Merge branch 'cb/common-prefix-unification'
2011-10-10 Merge branch 'jn/maint-http-error-message'
2011-10-10 Merge branch 'hv/submodule-update-none'
2011-10-10 Merge branch 'fg/submodule-git-file-git-dir'
2011-10-09 Makefile: fix permissions of mergetools/ checked out...
2011-10-05 Merge branch 'mm/mediawiki-as-a-remote'
2011-10-05 Merge branch 'rj/maint-t9159-svn-rev-notation'
2011-10-05 Merge branch 'jc/ls-remote-short-help'
2011-10-05 Merge branch 'sn/doc-update-index-assume-unchanged'
2011-10-05 Merge branch 'mg/maint-doc-sparse-checkout'
2011-10-05 Merge branch 'jk/argv-array'
2011-10-05 Merge branch 'tr/doc-note-rewrite'
2011-10-05 Merge branch 'mg/branch-list'
2011-10-05 Merge branch 'cb/send-email-help'
2011-10-05 Merge branch 'jk/for-each-ref'
2011-10-05 Merge branch 'wh/normalize-alt-odb-path'
2011-10-05 Merge branch 'hl/iso8601-more-zone-formats'
2011-10-05 Merge branch 'rj/quietly-create-dep-dir'
2011-10-05 Merge branch 'jc/receive-verify'
2011-10-05 Merge branch 'jc/fetch-verify'
2011-10-05 Merge branch 'jc/fetch-pack-fsck-objects'
2011-10-05 Merge branch 'jc/traverse-commit-list'
2011-10-05 Merge branch 'rr/revert-cherry-pick-continue'
2011-10-05 Merge branch 'da/make-auto-header-dependencies'
2011-10-05 Merge branch 'gb/am-hg-patch'
2011-10-05 Merge branch 'bc/unstash-clean-crufts'
2011-10-05 Merge branch 'fk/make-auto-header-dependencies'
2011-10-05 Merge branch 'ms/patch-id-with-overlong-line'
2011-10-05 Merge branch 'jc/maint-bundle-too-quiet'
2011-10-05 Merge branch 'jk/filter-branch-require-clean-work-tree'
2011-10-05 Merge branch 'jc/want-commit'
2011-10-05 Merge branch 'jc/maint-fsck-fwrite-size-check'
2011-10-05 Merge branch 'bk/ancestry-path'
2011-10-05 Merge branch 'jk/maint-fetch-submodule-check-fix'
2011-10-05 Merge branch 'tr/mergetool-valgrind'
2011-10-05 Merge branch 'nm/grep-object-sha1-lock'
2011-10-05 Merge branch 'jc/diff-index-unpack'
2011-10-05 Merge branch 'mm/rebase-i-exec-edit'
2011-10-05 Merge branch 'jc/maint-grep-untracked-exclude' into...
2011-09-26 Merge branch 'jc/namespace-doc-with-old-asciidoc'
2011-09-23 Merge 1.7.6.4 in
2011-09-20 Merge branch 'maint'
2011-09-19 Merge branch 'ph/format-patch-no-color'
2011-09-17 Merge branch 'ci/forbid-unwanted-current-branch-update'
2011-09-15 Merge branch 'ph/format-patch-no-color'
2011-09-12 Sync with 1.7.6.3
2011-09-12 Merge branch 'jn/remote-helpers-doc'
2011-09-12 Merge branch 'maint'
2011-09-06 Merge branch 'rc/histogram-diff'
2011-09-06 Merge branch 'cb/maint-ls-files-error-report'
2011-09-06 Merge branch 'mh/check-ref-format-print-normalize'
2011-09-06 Sync with 1.7.6.2
2011-09-02 Merge branch 'js/i18n-scripts-2'
2011-09-02 Merge branch 'tr/maint-t3903-misquoted-command'
2011-09-02 Merge branch 'bc/bisect-test-use-shell-path'
2011-09-02 Merge branch 'va/p4-branch-import-test-update'
2011-09-02 Merge branch 'tr/maint-strbuf-grow-nul-termination'
2011-09-02 Merge branch 'tr/maint-ident-to-git-memmove'
2011-09-02 Merge branch 'tr/maint-format-patch-empty-output'
2011-09-02 Merge branch 'gb/maint-am-stgit-author-to-from-fix'
next