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

]> git.ipfire.org Git - thirdparty/git.git/history - rerere.h

projects / thirdparty / git.git / history

2016-03-15	Junio C Hamano	rerere: allow multiple variants to exist	blob \| commitdiff \| raw
2016-02-08	Junio C Hamano	rerere: split conflict ID further	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: use "struct rerere_id" instead of "char *"...	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: call conflict-ids IDs	blob \| commitdiff \| raw \| diff to current
2015-05-11	Junio C Hamano	Merge branch 'jc/diff-no-index-d-f' into maint-2.3	blob \| commitdiff \| raw \| diff to current
2015-05-11	Junio C Hamano	Merge branch 'oh/fix-config-default-user-name-section...	blob \| commitdiff \| raw \| diff to current
2015-05-11	Junio C Hamano	Merge branch 'jc/epochtime-wo-tz' into maint-2.3	blob \| commitdiff \| raw \| diff to current
2015-04-27	Junio C Hamano	Merge branch 'ma/bash-completion-leaking-x' into maint	blob \| commitdiff \| raw \| diff to current
2015-04-27	Junio C Hamano	Merge branch 'jc/push-cert' into maint	blob \| commitdiff \| raw \| diff to current
2015-04-21	Junio C Hamano	Merge branch 'jk/colors' into maint	blob \| commitdiff \| raw \| diff to current
2015-04-21	Junio C Hamano	Merge branch 'pt/enter-repo-comment-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-04-21	Junio C Hamano	Merge branch 'jz/gitweb-conf-doc-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-04-21	Junio C Hamano	Merge branch 'jk/cherry-pick-docfix' into maint	blob \| commitdiff \| raw \| diff to current
2015-04-21	Junio C Hamano	Merge branch 'iu/fix-parse-options-h-comment' into...	blob \| commitdiff \| raw \| diff to current
2015-04-21	Junio C Hamano	Merge branch 'jg/cguide-we-cannot-count' into maint	blob \| commitdiff \| raw \| diff to current
2015-04-21	Junio C Hamano	Merge branch 'jn/doc-fast-import-no-16-octopus-limit...	blob \| commitdiff \| raw \| diff to current
2015-03-31	Junio C Hamano	Merge branch 'ss/pull-rebase-preserve' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-31	Junio C Hamano	Merge branch 'jc/report-path-error-to-dir' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-31	Junio C Hamano	Merge branch 'ph/push-doc-cas' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-28	Junio C Hamano	Merge branch 'jk/simplify-csum-file-sha1fd-check' into...	blob \| commitdiff \| raw \| diff to current
2015-03-28	Junio C Hamano	Merge branch 'nd/doc-git-index-version' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-28	Junio C Hamano	Merge branch 'ct/prompt-untracked-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-28	Junio C Hamano	Merge branch 'ws/grep-quiet-no-pager' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-28	Junio C Hamano	Merge branch 'jc/submitting-patches-mention-send-email...	blob \| commitdiff \| raw \| diff to current
2015-03-28	Junio C Hamano	Merge branch 'jk/cleanup-failed-clone' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-27	Junio C Hamano	Merge branch 'jk/tag-h-column-is-a-listing-option'...	blob \| commitdiff \| raw \| diff to current
2015-03-27	Junio C Hamano	Merge branch 'jk/smart-http-hide-refs' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-27	Junio C Hamano	Merge branch 'js/completion-ctags-pattern-substitution...	blob \| commitdiff \| raw \| diff to current
2015-03-23	Junio C Hamano	Merge branch 'rs/use-isxdigit' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-23	Junio C Hamano	Merge branch 'rs/deflate-init-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-23	Junio C Hamano	Merge branch 'jc/decorate-leaky-separator-color' into...	blob \| commitdiff \| raw \| diff to current
2015-03-23	Junio C Hamano	Merge branch 'mg/verify-commit' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'mr/doc-clean-f-f' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'ak/t5516-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'jc/diff-test-updates' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'jk/diffcore-rename-duplicate' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'bw/kwset-use-unsigned' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'nd/grep-exclude-standard-help-fix' into...	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'mk/diff-shortstat-dirstat-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'ms/submodule-update-config-doc' into...	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'jc/apply-beyond-symlink' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'rs/daemon-interpolate' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'jk/daemon-interpolate' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-06	Junio C Hamano	Merge branch 'rj/no-xopen-source-for-cygwin' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-06	Junio C Hamano	Merge branch 'rs/simple-cleanups' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-06	Junio C Hamano	Merge branch 'mm/am-c-doc' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'sb/plug-leak-in-make-cache-entry' into...	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jk/fast-import-die-nicely-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'es/blame-commit-info-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'ab/merge-file-prefix' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'ps/submodule-sanitize-path-upon-add'...	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jc/conf-var-doc' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jc/remote-set-url-doc' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jk/pack-bitmap' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jk/config-no-ungetc-eof' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jk/decimal-width-for-uintmax' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jc/push-cert' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'ks/rebase-i-abbrev' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jk/sanity' into maint	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'ak/add-i-empty-candidates' into maint	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jc/apply-ws-fix-expands' into maint	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'mg/commit-author-no-match-malformed-messa...	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jk/dumb-http-idx-fetch-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jc/diff-format-doc' into maint	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jk/status-read-branch-name-fix' into...	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'mg/push-repo-option-doc' into maint	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jn/rerere-fail-on-auto-update-failure...	blob \| commitdiff \| raw \| diff to current
2015-01-21	Junio C Hamano	Merge branch 'jk/http-push-symref-fix'	blob \| commitdiff \| raw \| diff to current
2015-01-21	Junio C Hamano	Merge branch 'ak/show-branch-usage-string'	blob \| commitdiff \| raw \| diff to current
2015-01-20	Junio C Hamano	Merge branch 'jk/colors'	blob \| commitdiff \| raw \| diff to current
2015-01-14	Junio C Hamano	Merge branch 'rc/for-each-ref-tracking'	blob \| commitdiff \| raw \| diff to current
2015-01-14	Junio C Hamano	Merge branch 'ak/show-branch-usage-string'	blob \| commitdiff \| raw \| diff to current
2015-01-14	Junio C Hamano	Merge branch 'mm/complete-rebase-autostash'	blob \| commitdiff \| raw \| diff to current
2015-01-14	Junio C Hamano	Merge branch 'aw/doc-smtp-ssl-cert-path'	blob \| commitdiff \| raw \| diff to current
2015-01-14	Junio C Hamano	Merge branch 'km/log-usage-string-i18n'	blob \| commitdiff \| raw \| diff to current
2015-01-14	Junio C Hamano	Merge branch 'jk/prune-packed-server-info'	blob \| commitdiff \| raw \| diff to current
2015-01-12	Junio C Hamano	Merge branch 'jk/read-packed-refs-without-path-max...	blob \| commitdiff \| raw \| diff to current
2015-01-12	Junio C Hamano	Merge branch 'mh/find-uniq-abbrev' into maint	blob \| commitdiff \| raw \| diff to current
2015-01-12	Junio C Hamano	Merge branch 'jk/approxidate-avoid-y-d-m-over-future...	blob \| commitdiff \| raw \| diff to current
2015-01-12	Junio C Hamano	Merge branch 'rw/apply-does-not-take-ignore-date' into...	blob \| commitdiff \| raw \| diff to current
2015-01-12	Junio C Hamano	Merge branch 'jk/for-each-reflog-ent-reverse' into...	blob \| commitdiff \| raw \| diff to current
2015-01-12	Junio C Hamano	Merge branch 'es/checkout-index-temp'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'maint-2.1' into maint	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'sb/t5400-remove-unused'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'lh/send-email-hide-x-mailer'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'rd/send-email-2047-fix'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'pd/completion-filenames-fix'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'jk/add-i-read-error'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'jk/approxidate-avoid-y-d-m-over-future...	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'jc/merge-bases'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'jc/diff-b-m'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'jc/clone-borrow'	blob \| commitdiff \| raw \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'jc/checkout-local-track-report'	blob \| commitdiff \| raw \| diff to current
2014-12-22	Junio C Hamano	Merge branch 'rs/use-strbuf-complete-line'	blob \| commitdiff \| raw \| diff to current
2014-12-22	Junio C Hamano	Merge branch 'jg/prompt-localize-temporary'	blob \| commitdiff \| raw \| diff to current
2014-12-22	Junio C Hamano	Merge branch 'jk/commit-date-approxidate'	blob \| commitdiff \| raw \| diff to current
2014-12-22	Junio C Hamano	Merge branch 'nd/split-index'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom