Public Git Hosting - git.git/search

2016-04-06	Junio C Hamano	rerere: adjust 'forget' to multi-variant world order Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-04-06	Junio C Hamano	rerere: split code to call ll_merge() further Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-04-06	Junio C Hamano	rerere: move code related to "forget" together Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-04-06	Junio C Hamano	rerere: gc and clear Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-03-15	Junio C Hamano	rerere: do use multiple variants Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-03-15	Junio C Hamano	t4200: rerere a merge with two identical conflicts Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-03-15	Junio C Hamano	rerere: allow multiple variants to exist Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-03-15	Junio C Hamano	rerere: delay the recording of preimage Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-03-15	Junio C Hamano	rerere: handle leftover rr-cache/$ID directory and... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-02-08	Junio C Hamano	rerere: scan $GIT_DIR/rr-cache/$ID when instantiating... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2016-02-08	Junio C Hamano	rerere: split conflict ID further Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: un-nest merge() further Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: use "struct rerere_id" instead of "char *"... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: call conflict-ids IDs Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: further clarify do_rerere_one_path() Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: further de-dent do_plain_rerere() Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: refactor "replay" part of do_plain_rerere() Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: explain the remainder Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: explain "rerere forget" codepath Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: explain the primary codepath Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: explain MERGE_RR management helpers Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: fix benign off-by-one non-bug and clarify code Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: explain the rerere I/O abstraction Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: do not leak mmfile[] for a path with multiple... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: stop looping unnecessarily Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: drop want_sp parameter from is_cmarker() Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: report autoupdated paths only after actually... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: write out each record of MERGE_RR in one go Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: lift PATH_MAX limitation Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: plug conflict ID leaks Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-07-24	Junio C Hamano	rerere: handle conflicts with multiple stage #1 entries Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-06-28	Junio C Hamano	rerere: fix an off-by-one non-bug Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-05-11	Junio C Hamano	Git 2.3.8 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-05-11	Junio C Hamano	Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3	commit \| commitdiff \| tree
2015-05-11	Junio C Hamano	Merge branch 'jc/diff-no-index-d-f' into maint-2.3	commit \| commitdiff \| tree
2015-05-11	Junio C Hamano	Merge branch 'oh/fix-config-default-user-name-section...	commit \| commitdiff \| tree
2015-05-11	Junio C Hamano	Merge branch 'jc/epochtime-wo-tz' into maint-2.3	commit \| commitdiff \| tree
2015-04-27	Junio C Hamano	Git 2.3.7 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-04-27	Junio C Hamano	Merge branch 'tb/connect-ipv6-parse-fix' into maint	commit \| commitdiff \| tree
2015-04-27	Junio C Hamano	Merge branch 'ma/bash-completion-leaking-x' into maint	commit \| commitdiff \| tree
2015-04-27	Junio C Hamano	Merge branch 'jc/push-cert' into maint	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Git 2.3.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Merge branch 'jk/colors' into maint	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Merge branch 'jk/test-annoyances' into maint	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Merge branch 'pt/enter-repo-comment-fix' into maint	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Merge branch 'jz/gitweb-conf-doc-fix' into maint	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Merge branch 'jk/cherry-pick-docfix' into maint	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Merge branch 'iu/fix-parse-options-h-comment' into...	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Merge branch 'jg/cguide-we-cannot-count' into maint	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Merge branch 'jk/pack-corruption-post-mortem' into...	commit \| commitdiff \| tree
2015-04-21	Junio C Hamano	Merge branch 'jn/doc-fast-import-no-16-octopus-limit...	commit \| commitdiff \| tree
2015-04-15	Junio C Hamano	parse_date_basic(): let the system handle DST conversion Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-04-15	Junio C Hamano	parse_date_basic(): return early when given a bogus... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-04-02	Junio C Hamano	push --signed: tighten what the receiving end can ask... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-31	Junio C Hamano	Git 2.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-31	Junio C Hamano	Merge branch 'ss/pull-rebase-preserve' into maint	commit \| commitdiff \| tree
2015-03-31	Junio C Hamano	Merge branch 'jc/report-path-error-to-dir' into maint	commit \| commitdiff \| tree
2015-03-31	Junio C Hamano	Merge branch 'ph/push-doc-cas' into maint	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Prepare for 2.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'sg/completion-gitcomp-nl-for-refs' into...	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'jk/simplify-csum-file-sha1fd-check' into...	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'tg/test-index-v4' into maint	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'nd/doc-git-index-version' into maint	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'ct/prompt-untracked-fix' into maint	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'ws/grep-quiet-no-pager' into maint	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'jc/submitting-patches-mention-send-email...	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'jk/cleanup-failed-clone' into maint	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'jk/fetch-pack' into maint	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'tg/fix-check-order-with-split-index'...	commit \| commitdiff \| tree
2015-03-28	Junio C Hamano	Merge branch 'jk/prune-with-corrupt-refs' into maint	commit \| commitdiff \| tree
2015-03-27	Junio C Hamano	Merge branch 'jk/tag-h-column-is-a-listing-option'...	commit \| commitdiff \| tree
2015-03-27	Junio C Hamano	Merge branch 'jk/smart-http-hide-refs' into maint	commit \| commitdiff \| tree
2015-03-27	Junio C Hamano	Merge branch 'js/completion-ctags-pattern-substitution...	commit \| commitdiff \| tree
2015-03-27	Junio C Hamano	Update mailmap to spell out "Alexander Kuleshov" Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-26	Junio C Hamano	diff-no-index: align D/F handling with that of normal Git Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-26	Junio C Hamano	diff-no-index: DWIM "diff D F" into "diff D/F F" Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-24	Junio C Hamano	report_path_error(): move to dir.c Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Git 2.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'rs/use-isxdigit' into maint	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'rs/deflate-init-cleanup' into maint	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'ak/git-done-help-cleanup' into maint	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'sg/completion-remote' into maint	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'mg/doc-status-color-slot' into maint	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'jc/decorate-leaky-separator-color' into...	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'kn/git-cd-to-empty' into maint	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'km/imap-send-libcurl-options' into maint	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'mg/verify-commit' into maint	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'es/rebase-i-count-todo' into maint	commit \| commitdiff \| tree
2015-03-23	Junio C Hamano	Merge branch 'tb/connect-ipv6-parse-fix' into maint	commit \| commitdiff \| tree
2015-03-15	Junio C Hamano	SubmittingPatches: encourage users to use format-patch... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Git 2.3.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Merge branch 'mr/doc-clean-f-f' into maint	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Merge branch 'ak/t5516-typofix' into maint	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Merge branch 'jc/diff-test-updates' into maint	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Merge branch 'jk/diffcore-rename-duplicate' into maint	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Merge branch 'bw/kwset-use-unsigned' into maint	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Merge branch 'nd/grep-exclude-standard-help-fix' into...	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Merge branch 'mg/doc-remote-tags-or-not' into maint	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Merge branch 'mk/diff-shortstat-dirstat-fix' into maint	commit \| commitdiff \| tree
2015-03-14	Junio C Hamano	Merge branch 'ms/submodule-update-config-doc' into...	commit \| commitdiff \| tree
next

The Best VCS Around

RSS Atom