Andrew's git
/
gitweb.git
/ search
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
rerere: delay the recording of preimage
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
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-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-02
push --signed: tighten what the receiving end can ask...
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-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-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
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-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
2015-03-23
Merge branch 'ak/git-done-help-cleanup' into maint
diff
|
tree
2015-03-23
Merge branch 'sg/completion-remote' into maint
diff
|
tree
2015-03-23
Merge branch 'mg/doc-status-color-slot' into maint
diff
|
tree
2015-03-23
Merge branch 'jc/decorate-leaky-separator-color' into...
diff
|
tree
2015-03-23
Merge branch 'kn/git-cd-to-empty' into maint
diff
|
tree
2015-03-23
Merge branch 'km/imap-send-libcurl-options' into maint
diff
|
tree
2015-03-23
Merge branch 'mg/verify-commit' into maint
diff
|
tree
2015-03-23
Merge branch 'es/rebase-i-count-todo' into maint
diff
|
tree
2015-03-23
Merge branch 'tb/connect-ipv6-parse-fix' into maint
diff
|
tree
2015-03-15
SubmittingPatches: encourage users to use format-patch...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2015-03-14
Git 2.3.3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2015-03-14
Merge branch 'mr/doc-clean-f-f' into maint
diff
|
tree
2015-03-14
Merge branch 'ak/t5516-typofix' into maint
diff
|
tree
2015-03-14
Merge branch 'jc/diff-test-updates' into maint
diff
|
tree
2015-03-14
Merge branch 'jk/diffcore-rename-duplicate' into maint
diff
|
tree
2015-03-14
Merge branch 'bw/kwset-use-unsigned' into maint
diff
|
tree
2015-03-14
Merge branch 'nd/grep-exclude-standard-help-fix' into...
diff
|
tree
2015-03-14
Merge branch 'mg/doc-remote-tags-or-not' into maint
diff
|
tree
2015-03-14
Merge branch 'mk/diff-shortstat-dirstat-fix' into maint
diff
|
tree
2015-03-14
Merge branch 'ms/submodule-update-config-doc' into...
diff
|
tree
2015-03-14
Merge branch 'jc/apply-beyond-symlink' into maint
diff
|
tree
2015-03-14
Merge branch 'rs/daemon-interpolate' into maint
diff
|
tree
2015-03-14
Merge branch 'jk/daemon-interpolate' into maint
diff
|
tree
2015-03-06
Git 2.3.2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2015-03-06
Merge branch 'rj/no-xopen-source-for-cygwin' into maint
diff
|
tree
2015-03-06
Merge branch 'rs/simple-cleanups' into maint
diff
|
tree
2015-03-06
Merge branch 'mm/am-c-doc' into maint
diff
|
tree