summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-07-15Merge branch 'ar/clone-honor-umask-at-top'Libravatar Junio C Hamano3-3/+3
2012-07-15Merge branch 'jc/apply-3way'Libravatar Junio C Hamano4-118/+615
2012-07-15Merge branch 'cw/rebase-i-root'Libravatar Junio C Hamano5-17/+74
2012-07-15Merge branch 'pw/git-p4-move'Libravatar Junio C Hamano3-40/+72
2012-07-13Merge branch 'pw/git-p4-jobs'Libravatar Junio C Hamano4-88/+273
2012-07-13Merge branch 'jk/push-delete-ref-error-message'Libravatar Junio C Hamano1-0/+3
2012-07-13Sixth batch for 1.7.12Libravatar Junio C Hamano1-0/+33
2012-07-13Merge branch 'jc/refactor-diff-stdin'Libravatar Junio C Hamano4-50/+67
2012-07-13Merge branch 'tg/ce-namelen'Libravatar Junio C Hamano2-3/+3
2012-07-13Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Libravatar Junio C Hamano13-10/+446
2012-07-13Merge branch 'mm/mediawiki-tests'Libravatar Junio C Hamano18-26/+2260
2012-07-13Merge branch 'jn/vcs-svn'Libravatar Junio C Hamano9-43/+31
2012-07-13Merge branch 'mm/mediawiki-file-attachments'Libravatar Junio C Hamano1-64/+386
2012-07-13Merge branch 'tr/maint-show-walk'Libravatar Junio C Hamano2-0/+94
2012-07-13Merge branch 'mz/rebase-no-mbox'Libravatar Junio C Hamano7-36/+66
2012-07-12git p4: add support for 'p4 move' in P4SubmitLibravatar Gary Gibbons2-16/+34
2012-07-11Reduce draft release notes to 1.7.12Libravatar Junio C Hamano1-61/+0
2012-07-11Sync with 1.7.11.2Libravatar Junio C Hamano2-1/+55
2012-07-11Git 1.7.11.2Libravatar Junio C Hamano4-3/+57
2012-07-11Merge branch 'jc/maint-blame-unique-abbrev' into maintLibravatar Junio C Hamano1-4/+21
2012-07-11Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maintLibravatar Junio C Hamano2-2/+10
2012-07-11Merge branch 'th/diff-no-index-fixes' into maintLibravatar Junio C Hamano5-24/+112
2012-07-11Merge branch 'nd/clone-single-fix' into maintLibravatar Junio C Hamano2-3/+11
2012-07-11Merge branch 'jc/rev-list-simplify-merges-first-parent' into maintLibravatar Junio C Hamano1-12/+29
2012-07-11Merge branch 'hv/submodule-update-nuke-submodules' into maintLibravatar Junio C Hamano1-6/+0
2012-07-11Merge branch 'jk/diff-no-index-pager' into maintLibravatar Junio C Hamano3-15/+22
2012-07-11Merge branch 'mm/verify-filename-fix' into maintLibravatar Junio C Hamano8-10/+44
2012-07-11Merge branch 'cn/cherry-pick-range-docs' into maintLibravatar Junio C Hamano2-1/+13
2012-07-11Merge branch 'jc/ustar-checksum-is-unsigned' into maintLibravatar Junio C Hamano1-3/+3
2012-07-11Merge branch 'jc/bundle-complete-notice' into maintLibravatar Junio C Hamano1-6/+10
2012-07-11Merge branch 'jc/ls-files-i-dir' into maintLibravatar Junio C Hamano6-10/+109
2012-07-11Merge branch 'jc/request-pull-match-tagname' into maintLibravatar Junio C Hamano1-7/+22
2012-07-09apply: tests for the --3way optionLibravatar Junio C Hamano1-0/+54
2012-07-09add: create ADD_EDIT.patch with mode 0666Libravatar Jeff King1-1/+1
2012-07-09rerere: make rr-cache fanout directory honor umaskLibravatar Junio C Hamano1-1/+1
2012-07-09apply: document --3way optionLibravatar Junio C Hamano1-1/+10
2012-07-09apply: allow rerere() to work on --3way resultsLibravatar Junio C Hamano2-0/+28
2012-07-09apply: register conflicted stages to the indexLibravatar Junio C Hamano2-6/+138
2012-07-09apply: --3way with add/add conflictLibravatar Junio C Hamano1-8/+62
2012-07-09apply: move verify_index_match() higherLibravatar Junio C Hamano1-10/+10
2012-07-09apply: plug the three-way merge logic inLibravatar Junio C Hamano1-3/+50
2012-07-09apply: fall back on three-way mergeLibravatar Junio C Hamano1-1/+45
2012-07-09apply: accept -3/--3way command line optionLibravatar Junio C Hamano2-2/+31
2012-07-09apply: move "already exists" logic to check_to_create()Libravatar Junio C Hamano1-11/+29
2012-07-09apply: move check_to_create_blob() closer to its sole callerLibravatar Junio C Hamano1-23/+23
2012-07-09apply: further split load_preimage()Libravatar Junio C Hamano1-19/+40
2012-07-09apply: refactor "previous patch" logicLibravatar Junio C Hamano1-26/+56
2012-07-09apply: split load_preimage() helper function outLibravatar Junio C Hamano1-3/+12
2012-07-09apply: factor out checkout_target() helper functionLibravatar Junio C Hamano1-7/+13
2012-07-09apply: refactor read_file_or_gitlink()Libravatar Junio C Hamano1-7/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-29 13:29:51 +0000