Andrew's git / gitweb.git / search
?
rerere: plug memory leaks upon "rerere forget" failure
2016-05-11 rerere: plug memory leaks upon "rerere forget" failure
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-04-06 rerere: adjust 'forget' to multi-variant world order
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-04-06 rerere: split code to call ll_merge() further
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-04-06 rerere: move code related to "forget" together
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-04-06 rerere: gc and clear
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-03-15 rerere: do use multiple variants
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-03-15 t4200: rerere a merge with two identical conflicts
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-03-15 rerere: allow multiple variants to exist
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-03-15 rerere: delay the recording of preimage
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-03-15 rerere: handle leftover rr-cache/$ID directory and...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-02-08 rerere: scan $GIT_DIR/rr-cache/$ID when instantiating...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-02-08 rerere: split conflict ID further
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2016-02-08 rerere: replace strcpy with xsnprintf
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: un-nest merge() further
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: use "struct rerere_id" instead of "char *"...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: call conflict-ids IDs
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: further clarify do_rerere_one_path()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: further de-dent do_plain_rerere()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: refactor "replay" part of do_plain_rerere()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: explain the remainder
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: explain "rerere forget" codepath
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: explain the primary codepath
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: explain MERGE_RR management helpers
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: fix benign off-by-one non-bug and clarify code
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: explain the rerere I/O abstraction
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: do not leak mmfile[] for a path with multiple...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: stop looping unnecessarily
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: drop want_sp parameter from is_cmarker()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: report autoupdated paths only after actually...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: write out each record of MERGE_RR in one go
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: lift PATH_MAX limitation
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: plug conflict ID leaks
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-07-24 rerere: handle conflicts with multiple stage #1 entries
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-06-28 rerere: fix an off-by-one non-bug
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-05-11 Git 2.3.8
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-05-11 Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3
 diff | tree
2015-05-11 Merge branch 'jc/diff-no-index-d-f' into maint-2.3
 diff | tree
2015-05-11 Merge branch 'oh/fix-config-default-user-name-section...
diff | tree
2015-05-11 Merge branch 'jc/epochtime-wo-tz' into maint-2.3
 diff | tree
2015-04-27 Git 2.3.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-27 Merge branch 'tb/connect-ipv6-parse-fix' into maint
 diff | tree
2015-04-27 Merge branch 'ma/bash-completion-leaking-x' into maint
 diff | tree
2015-04-27 Merge branch 'jc/push-cert' into maint
 diff | tree
2015-04-21 Git 2.3.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-21 Merge branch 'jk/colors' into maint
 diff | tree
2015-04-21 Merge branch 'jk/test-annoyances' into maint
 diff | tree
2015-04-21 Merge branch 'pt/enter-repo-comment-fix' into maint
 diff | tree
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
 diff | tree
2015-04-21 Merge branch 'jk/cherry-pick-docfix' into maint
 diff | tree
2015-04-21 Merge branch 'iu/fix-parse-options-h-comment' into...
diff | tree
2015-04-21 Merge branch 'jg/cguide-we-cannot-count' into maint
 diff | tree
2015-04-21 Merge branch 'jk/pack-corruption-post-mortem' into...
diff | tree
2015-04-21 Merge branch 'jn/doc-fast-import-no-16-octopus-limit...
diff | tree
2015-04-20 log -L: improve error message on malformed argument
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-20 Documentation: change -L:<regex> to -L:<funcname>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-17 config: fix settings in default_user_config template
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-15 parse_date_basic(): let the system handle DST conversion
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-15 parse_date_basic(): return early when given a bogus...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-14 CodingGuidelines: update 'rough' rule count
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-13 completion: fix global bash variable leak on __gitcompappend
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-09 connect.c: ignore extra colon after hostname
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-04 diff-highlight: do not split multibyte characters
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-02 push --signed: tighten what the receiving end can ask...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-02 howto: document more tools for recovery corruption
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-04-01 fast-import doc: remove suggested 16-parent limit
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-31 Git 2.3.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-31 Merge branch 'ss/pull-rebase-preserve' into maint
 diff | tree
2015-03-31 Merge branch 'jc/report-path-error-to-dir' into maint
 diff | tree
2015-03-31 Merge branch 'ph/push-doc-cas' into maint
 diff | tree
2015-03-31 gitweb.conf.txt: say "build-time", not "built-time"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-31 enter_repo(): fix docs to match code
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-31 cherry-pick: fix docs describing handling of empty...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-30 docs: clarify what git-rebase's "-p" / "--preserve...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-30 parse-options.h: OPTION_{BIT,SET_INT} do not store...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-28 Prepare for 2.3.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-28 Merge branch 'sg/completion-gitcomp-nl-for-refs' into...
diff | tree
2015-03-28 Merge branch 'jk/simplify-csum-file-sha1fd-check' into...
diff | tree
2015-03-28 Merge branch 'tg/test-index-v4' into maint
 diff | tree
2015-03-28 Merge branch 'nd/doc-git-index-version' into maint
 diff | tree
2015-03-28 Merge branch 'ct/prompt-untracked-fix' into maint
 diff | tree
2015-03-28 Merge branch 'ws/grep-quiet-no-pager' into maint
 diff | tree
2015-03-28 Merge branch 'jc/submitting-patches-mention-send-email...
diff | tree
2015-03-28 Merge branch 'jk/cleanup-failed-clone' into maint
 diff | tree
2015-03-28 Merge branch 'jk/fetch-pack' into maint
 diff | tree
2015-03-28 Merge branch 'tg/fix-check-order-with-split-index'...
diff | tree
2015-03-28 Merge branch 'jk/prune-with-corrupt-refs' into maint
 diff | tree
2015-03-28 2.3.2 release notes: typofix
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-27 Merge branch 'jk/tag-h-column-is-a-listing-option'...
diff | tree
2015-03-27 Merge branch 'jk/smart-http-hide-refs' into maint
 diff | tree
2015-03-27 Merge branch 'js/completion-ctags-pattern-substitution...
diff | tree
2015-03-27 Update mailmap to spell out "Alexander Kuleshov"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-26 diff-no-index: align D/F handling with that of normal Git
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-26 docs: clarify "preserve" option wording for git-pull
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-26 git-push.txt: clean up force-with-lease wording
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-26 diff-no-index: DWIM "diff D F" into "diff D/F F"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-24 report_path_error(): move to dir.c
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-24 git.txt: list index versions in plain English
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-23 Git 2.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2015-03-23 Merge branch 'rs/use-isxdigit' into maint
 diff | tree
2015-03-23 Merge branch 'rs/deflate-init-cleanup' into maint
 diff | tree