timestamp_t: a new data type for timestamps
[gitweb.git] / builtin / merge-file.c
2017-04-20 Merge branch 'jh/memihash-opt'
2017-04-20 Merge branch 'vn/revision-shorthand-for-side-branch...
2017-04-20 Merge branch 'sf/putty-w-args'
2017-04-20 Merge branch 'ld/p4-current-branch-fix'
2017-04-20 Merge branch 'dt/gc-ignore-old-gc-logs'
2017-04-20 Merge branch 'bw/attr-pathspec'
2017-04-20 Merge branch 'ab/grep-plug-pathspec-leak'
2017-04-20 Merge branch 'jk/no-looking-at-dotgit-outside-repo'
2017-04-20 Merge branch 'nd/files-backend-git-dir'
2017-04-20 Merge branch 'bw/submodule-is-active'
2017-04-20 Merge branch 'va/i18n-perl-scripts'
2017-04-20 Merge branch 'sb/submodule-rm-absorb'
2017-04-20 Merge branch 'ah/diff-files-ours-theirs-doc'
2017-04-20 Merge branch 'lt/mailinfo-in-body-header-continuation'
2017-04-20 Merge branch 'bc/object-id'
2017-04-20 Merge branch 'sb/submodule-short-status'
2017-04-17 Merge branch 'js/difftool-builtin'
2017-04-17 Merge branch 'ab/regen-perl-mak-with-different-perl'
2017-04-17 Merge branch 'sb/show-diff-for-submodule-in-diff-fix'
2017-04-17 Merge branch 'qp/bisect-docfix'
2017-04-17 Merge branch 'mm/ls-files-s-doc'
2017-04-17 Merge branch 'jk/loose-object-info-report-error'
2017-04-17 Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-04-17 Merge branch 'jc/unused-symbols'
2017-04-11 Merge branch 'cc/untracked'
2017-04-11 Merge branch 'ah/log-decorate-default-to-auto'
2017-04-11 Merge branch 'ab/ref-filter-no-contains'
2017-03-30 Merge branch 'jk/make-coccicheck-detect-errors'
2017-03-30 Merge branch 'bc/push-cert-receive-fix'
2017-03-30 Merge branch 'mh/notes-tree-consolidate-fix'
2017-03-30 Merge branch 'js/rebase-i-reword-to-run-hooks'
2017-03-30 Merge branch 'ab/case-insensitive-upstream-and-push...
2017-03-30 Merge branch 'ab/doc-submitting'
2017-03-30 Merge branch 'ab/test-readme-updates'
2017-03-30 Merge branch 'rs/freebsd-getcwd-workaround'
2017-03-30 Merge branch 'bw/recurse-submodules-relative-fix'
2017-03-30 Merge branch 'sg/completion-ctags'
2017-03-30 Merge branch 'sg/completion-refs-speedup'
2017-03-30 Merge branch 'bw/submodule-is-active'
2017-03-30 Merge branch 'jk/no-looking-at-dotgit-outside-repo...
2017-03-30 Merge branch 'jc/merge-drop-old-syntax'
2017-03-28 Sync with 'maint'
2017-03-28 Merge branch 'jk/sha1dc'
2017-03-28 Merge branch 'jh/memihash-opt'
2017-03-28 Merge branch 'jk/fast-import-cleanup'
2017-03-28 Merge branch 'sg/skip-prefix-in-prettify-refname'
2017-03-28 Merge branch 'ab/branch-list-doc'
2017-03-28 Merge branch 'jk/pager-in-use'
2017-03-28 Merge branch 'tg/stash-push-fixup'
2017-03-28 Merge branch 'sb/checkout-recurse-submodules'
2017-03-28 Merge branch 'bw/grep-recurse-submodules'
2017-03-28 Merge branch 'rs/path-name-safety-cleanup' into maint
2017-03-28 Merge branch 'js/regexec-buf' into maint
2017-03-27 Merge branch 'km/config-grammofix'
2017-03-27 Merge branch 'sb/t3600-rephrase'
2017-03-27 Merge branch 'sb/describe-broken'
2017-03-27 Merge branch 'sb/push-options-via-transport'
2017-03-27 Merge branch 'km/t1400-modernization'
2017-03-27 Merge branch 'jk/prefix-filename'
2017-03-24 Merge branch 'rs/path-name-safety-cleanup'
2017-03-24 Merge branch 'js/regexec-buf'
2017-03-21 Merge branch 'jc/diff-populate-filespec-size-only-fix...
2017-03-21 Merge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-21 prefix_filename: return newly allocated string
2017-03-21 prefix_filename: drop length parameter
2017-03-13 Merge branch 'jc/diff-populate-filespec-size-only-fix'
2017-03-13 Merge branch 'jk/ewah-use-right-type-in-sizeof'
2017-02-24 Merge branch 'bc/worktree-doc-fix-detached'
2017-02-24 Merge branch 'rt/align-add-i-help-text'
2017-02-24 Merge branch 'bc/blame-doc-fix'
2017-02-16 Merge branch 'ls/p4-path-encoding'
2017-02-15 Merge branch 'sb/doc-unify-bottom'
2017-02-10 Merge branch 'ps/worktree-prune-help-fix'
2017-02-02 Merge branch 'mm/reset-facl-before-umask-test'
2017-02-02 Merge branch 'ws/request-pull-code-cleanup' into maint
2017-01-31 Merge branch 'ad/bisect-terms' into maint
2017-01-31 Merge branch 'jk/grep-e-could-be-extended-beyond-posix...
2017-01-31 Merge branch 'km/branch-get-push-while-detached' into...
2017-01-31 Merge branch 'jc/latin-1' into maint
2017-01-31 Merge branch 'jk/vreport-sanitize'
2017-01-23 Merge branch 'ws/request-pull-code-cleanup'
2017-01-23 Merge branch 'ad/bisect-terms'
2017-01-23 Merge branch 'jk/grep-e-could-be-extended-beyond-posix'
2017-01-18 Merge branch 'sb/remove-gitview'
2017-01-18 Merge branch 'km/branch-get-push-while-detached'
2017-01-18 Merge git://ozlabs.org/~paulus/gitk
2017-01-17 Merge branch 'mm/gc-safety-doc' into maint
2017-01-17 Merge branch 'mm/push-social-engineering-attack-doc...
2017-01-17 Merge branch 'jt/fetch-no-redundant-tag-fetch-map'...
2017-01-17 Merge branch 'lr/doc-fix-cet' into maint
2017-01-17 Merge branch 'sb/t3600-cleanup' into maint
2017-01-17 Merge branch 'sb/unpack-trees-grammofix' into maint
2017-01-17 Merge branch 'mk/mingw-winansi-ttyname-termination...
2017-01-17 Merge branch 'jc/push-default-explicit' into maint
2017-01-17 Merge branch 'jc/pull-rebase-ff' into maint
2017-01-17 Merge branch 'jc/renormalize-merge-kill-safer-crlf...
2017-01-17 Merge branch 'bb/unicode-9.0' into maint
2017-01-10 Merge branch 'mm/gc-safety-doc'
2017-01-10 Merge branch 'mm/push-social-engineering-attack-doc'
2017-01-10 Merge branch 'jt/fetch-no-redundant-tag-fetch-map'
next