git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - builtin/merge.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / builtin / merge.c

2017-05-08	brian m. carlson	Convert lookup_commit* to struct object_id	blob \| commitdiff \| raw
2017-05-01	Junio C Hamano	Merge branch 'jk/submodule-init-segv-fix'	blob \| commitdiff \| raw \| diff to current
2017-05-01	Junio C Hamano	Merge branch 'jk/prio-queue-avoid-swap-with-self'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'mh/separate-ref-cache'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'nd/worktree-add-lock'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'jk/update-links-in-docs'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'sf/putty-w-args'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'ab/completion-push-delete-ref'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'cc/split-index-config'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'jk/war-on-git-path'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'jh/add-index-entry-optim'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'ss/submodule-shallow-doc'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'ss/gitmodules-ignore-doc'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'nd/conditional-config-in-early-config'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'ab/push-cas-doc-n-test'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'ls/travis-coccicheck'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'ps/pathspec-empty-prefix-origin'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'pc/t2027-git-to-pipe-cleanup'	blob \| commitdiff \| raw \| diff to current
2017-04-26	Junio C Hamano	Merge branch 'gb/rebase-signoff'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'dt/xgethostname-nul-termination'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'jk/ls-files-recurse-submodules-fix'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'rs/misc-cppcheck-fixes'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'jk/snprintf-cleanups'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'xy/format-patch-base'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'sb/checkout-recurse-submodules'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'jt/fetch-pack-error-reporting'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'km/t1400-modernization'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'jk/quarantine-received-objects'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'jk/loose-object-fsck'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'bw/submodule-with-bs-path'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'jh/verify-index-checksum-only-in-fsck'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'jh/unpack-trees-micro-optim'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'jh/string-list-micro-optim'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'nd/conditional-config-include'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'dt/http-postbuffer-can-be-large'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'tb/doc-eol-normalization'	blob \| commitdiff \| raw \| diff to current
2017-04-24	Junio C Hamano	Merge branch 'sr/http-proxy-configuration-fix'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'jh/memihash-opt'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'vn/revision-shorthand-for-side-branch...	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'sf/putty-w-args'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'ld/p4-current-branch-fix'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'dt/gc-ignore-old-gc-logs'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'bw/attr-pathspec'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'ab/grep-plug-pathspec-leak'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'jk/no-looking-at-dotgit-outside-repo'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'nd/files-backend-git-dir'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'bw/submodule-is-active'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'va/i18n-perl-scripts'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'sb/submodule-rm-absorb'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'ah/diff-files-ours-theirs-doc'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'lt/mailinfo-in-body-header-continuation'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'bw/push-options-recursively-to-submodules'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'bc/object-id'	blob \| commitdiff \| raw \| diff to current
2017-04-20	Junio C Hamano	Merge branch 'sb/submodule-short-status'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'js/difftool-builtin'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'sb/unpack-trees-would-lose-submodule...	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'ab/regen-perl-mak-with-different-perl'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'sb/show-diff-for-submodule-in-diff-fix'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'qp/bisect-docfix'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'mm/ls-files-s-doc'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jk/loose-object-info-report-error'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jc/bs-t-is-not-a-tab-for-sed'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jc/unused-symbols'	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jk/snprintf-cleanups'	blob \| commitdiff \| raw \| diff to current
2017-04-11	Junio C Hamano	Merge branch 'ls/travis-relays-for-windows-ci'	blob \| commitdiff \| raw \| diff to current
2017-04-11	Junio C Hamano	Merge branch 'cc/untracked'	blob \| commitdiff \| raw \| diff to current
2017-04-11	Junio C Hamano	Merge branch 'ah/log-decorate-default-to-auto'	blob \| commitdiff \| raw \| diff to current
2017-04-11	Junio C Hamano	Merge branch 'ab/ref-filter-no-contains'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'jk/make-coccicheck-detect-errors'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'bc/push-cert-receive-fix'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'mh/notes-tree-consolidate-fix'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'js/rebase-i-reword-to-run-hooks'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'mg/describe-debug-l10n'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'ab/case-insensitive-upstream-and-push...	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'ab/doc-submitting'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'ab/test-readme-updates'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'rs/freebsd-getcwd-workaround'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'bw/recurse-submodules-relative-fix'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'sg/completion-ctags'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'sg/completion-refs-speedup'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'bw/submodule-is-active'	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'jk/no-looking-at-dotgit-outside-repo...	blob \| commitdiff \| raw \| diff to current
2017-03-30	Junio C Hamano	Merge branch 'jc/merge-drop-old-syntax'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Sync with 'maint'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'jk/sha1dc'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'jh/memihash-opt'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'jk/fast-import-cleanup'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'sg/skip-prefix-in-prettify-refname'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'ab/branch-list-doc'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'jk/pager-in-use'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'tg/stash-push-fixup'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'sb/checkout-recurse-submodules'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'bw/grep-recurse-submodules'	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'km/config-grammofix' into maint	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'sb/t3600-rephrase' into maint	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'sb/submodule-update-initial-runs-custom...	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'jk/quote-env-path-list-component' into...	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'rs/update-hook-optim' into maint	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'rs/shortlog-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2017-03-28	Junio C Hamano	Merge branch 'rs/path-name-safety-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom