summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-07-16Merge branch 'cw/amend-commit-without-message'Junio C Hamano
2012-07-16Merge branch 'jn/makefile-cleanup'Junio C Hamano
2012-07-16Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano
2012-07-16Merge branch 'jc/apply-3way'Junio C Hamano
2012-07-16Merge branch 'cw/rebase-i-root'Junio C Hamano
2012-07-16Merge branch 'pw/git-p4-move'Junio C Hamano
2012-07-14Merge branch 'pw/git-p4-jobs'Junio C Hamano
2012-07-14Merge branch 'jk/push-delete-ref-error-message'Junio C Hamano
2012-07-13Sixth batch for 1.7.12Junio C Hamano
2012-07-13Merge branch 'jc/refactor-diff-stdin'Junio C Hamano
2012-07-13Merge branch 'tg/ce-namelen'Junio C Hamano
2012-07-13Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano
2012-07-13Merge branch 'mm/mediawiki-tests'Junio C Hamano
2012-07-13Merge branch 'jn/vcs-svn'Junio C Hamano
2012-07-13Merge branch 'mm/mediawiki-file-attachments'Junio C Hamano
2012-07-13Merge branch 'tr/maint-show-walk'Junio C Hamano
2012-07-13Merge branch 'mz/rebase-no-mbox'Junio C Hamano
2012-07-12git p4: add support for 'p4 move' in P4SubmitGary Gibbons
2012-07-11Reduce draft release notes to 1.7.12Junio C Hamano
2012-07-11Sync with 1.7.11.2Junio C Hamano
2012-07-11Git 1.7.11.2v1.7.11.2Junio C Hamano
2012-07-11Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano
2012-07-11Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maintJunio C Hamano
2012-07-11Merge branch 'th/diff-no-index-fixes' into maintJunio C Hamano
2012-07-11Merge branch 'nd/clone-single-fix' into maintJunio C Hamano
2012-07-11Merge branch 'jc/rev-list-simplify-merges-first-parent' into maintJunio C Hamano
2012-07-11Merge branch 'hv/submodule-update-nuke-submodules' into maintJunio C Hamano
2012-07-11Merge branch 'jk/diff-no-index-pager' into maintJunio C Hamano
2012-07-11Merge branch 'mm/verify-filename-fix' into maintJunio C Hamano
2012-07-11Merge branch 'cn/cherry-pick-range-docs' into maintJunio C Hamano
2012-07-11Merge branch 'jc/ustar-checksum-is-unsigned' into maintJunio C Hamano
2012-07-11Merge branch 'jc/bundle-complete-notice' into maintJunio C Hamano
2012-07-11Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano
2012-07-11Merge branch 'jc/request-pull-match-tagname' into maintJunio C Hamano
2012-07-10apply: tests for the --3way optionJunio C Hamano
2012-07-10add: create ADD_EDIT.patch with mode 0666Jeff King
2012-07-09rerere: make rr-cache fanout directory honor umaskJunio C Hamano
2012-07-09apply: document --3way optionJunio C Hamano
2012-07-09apply: allow rerere() to work on --3way resultsJunio C Hamano
2012-07-09apply: register conflicted stages to the indexJunio C Hamano
2012-07-09apply: --3way with add/add conflictJunio C Hamano
2012-07-09apply: move verify_index_match() higherJunio C Hamano
2012-07-09apply: plug the three-way merge logic inJunio C Hamano
2012-07-09apply: fall back on three-way mergeJunio C Hamano
2012-07-09apply: accept -3/--3way command line optionJunio C Hamano
2012-07-09apply: move "already exists" logic to check_to_create()Junio C Hamano
2012-07-09apply: move check_to_create_blob() closer to its sole callerJunio C Hamano
2012-07-09apply: further split load_preimage()Junio C Hamano
2012-07-09apply: refactor "previous patch" logicJunio C Hamano
2012-07-09apply: split load_preimage() helper function outJunio C Hamano