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

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

projects / thirdparty / git.git / history

2016-03-15	Junio C Hamano	rerere: do use multiple variants	blob \| commitdiff \| raw
2016-03-15	Junio C Hamano	rerere: allow multiple variants to exist	blob \| commitdiff \| raw \| diff to current
2016-03-15	Junio C Hamano	rerere: delay the recording of preimage	blob \| commitdiff \| raw \| diff to current
2016-03-15	Junio C Hamano	rerere: handle leftover rr-cache/$ID directory and...	blob \| commitdiff \| raw \| diff to current
2016-02-08	Junio C Hamano	rerere: scan $GIT_DIR/rr-cache/$ID when instantiating...	blob \| commitdiff \| raw \| diff to current
2016-02-08	Junio C Hamano	rerere: split conflict ID further	blob \| commitdiff \| raw \| diff to current
2016-02-08	Jeff King	rerere: replace strcpy with xsnprintf	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: un-nest merge() 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-07-24	Junio C Hamano	rerere: further clarify do_rerere_one_path()	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: further de-dent do_plain_rerere()	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: refactor "replay" part of do_plain_rerere()	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: explain the remainder	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: explain "rerere forget" codepath	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: explain the primary codepath	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: explain MERGE_RR management helpers	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: fix benign off-by-one non-bug and clarify code	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: explain the rerere I/O abstraction	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: do not leak mmfile[] for a path with multiple...	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: stop looping unnecessarily	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: drop want_sp parameter from is_cmarker()	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: report autoupdated paths only after actually...	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: write out each record of MERGE_RR in one go	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: lift PATH_MAX limitation	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: plug conflict ID leaks	blob \| commitdiff \| raw \| diff to current
2015-07-24	Junio C Hamano	rerere: handle conflicts with multiple stage #1 entries	blob \| commitdiff \| raw \| diff to current
2015-06-28	Junio C Hamano	rerere: fix an off-by-one non-bug	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 'tb/connect-ipv6-parse-fix' into maint	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 'jk/pack-corruption-post-mortem' into...	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 'tg/test-index-v4' into maint	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-28	Junio C Hamano	Merge branch 'jk/fetch-pack' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-28	Junio C Hamano	Merge branch 'tg/fix-check-order-with-split-index'...	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 'ak/git-done-help-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-23	Junio C Hamano	Merge branch 'sg/completion-remote' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-23	Junio C Hamano	Merge branch 'mg/doc-status-color-slot' 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 'kn/git-cd-to-empty' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-23	Junio C Hamano	Merge branch 'km/imap-send-libcurl-options' into maint	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-23	Junio C Hamano	Merge branch 'es/rebase-i-count-todo' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-23	Junio C Hamano	Merge branch 'tb/connect-ipv6-parse-fix' 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-06	Junio C Hamano	Merge branch 'ew/svn-maint-fixes' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-06	Junio C Hamano	Merge branch 'km/send-email-getopt-long-workarounds...	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 'jk/prune-mtime' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'tc/curl-vernum-output-broken-in-7.11...	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'es/squelch-openssl-warnings-on-macosx...	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 'av/wincred-with-at-in-username-fix' into...	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'ch/new-gpg-drops-rfc-1991' 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
next

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

RSS Atom