summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2012-07-09apply: clear_image() clears things a bit moreLibravatar Junio C Hamano1-2/+2
2012-07-09apply: a bit more comments on PATH_TO_BE_DELETEDLibravatar Junio C Hamano1-2/+8
2012-07-09apply: fix an incomplete comment in check_patch()Libravatar Junio C Hamano1-9/+15
2012-05-07The ninth batch of topics graduated to 'master'Libravatar Junio C Hamano1-50/+19
2012-05-07Merge branch 'nh/empty-rebase'Libravatar Junio C Hamano1-3/+11
2012-05-07Merge branch 'zj/diff-empty-chmod'Libravatar Junio C Hamano2-34/+74
2012-05-07Merge branch 'jk/maint-tformat-with-z'Libravatar Junio C Hamano2-1/+29
2012-05-07Merge branch 'th/difftool-diffall'Libravatar Junio C Hamano4-87/+398
2012-05-07Sync with maintLibravatar Junio C Hamano2-2/+49
2012-05-07Start preparing for 1.7.10.2Libravatar Junio C Hamano2-1/+47
2012-05-07Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maintLibravatar Junio C Hamano3-3/+3
2012-05-07Merge branch 'js/daemon-test-race-fix' into maintLibravatar Junio C Hamano1-11/+11
2012-05-07Merge branch 'jk/maint-config-bogus-section' into maintLibravatar Junio C Hamano2-1/+31
2012-05-07Merge branch 'pw/t5800-import-race-fix' into maintLibravatar Junio C Hamano2-0/+20
2012-05-07Merge branch 'rt/cherry-revert-conflict-summary' into maintLibravatar Junio C Hamano1-1/+1
2012-05-07Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maintLibravatar Junio C Hamano1-9/+13
2012-05-07git p4 doc: fix formattingLibravatar Pete Wyckoff1-1/+3
2012-05-04Makefile: keep many variable list sortedLibravatar Nguyễn Thái Ngọc Duy1-13/+13
2012-05-03git cherry-pick: do not dereference a potential NULL pointerLibravatar Neil Horman1-3/+11
2012-05-03Merge branch 'maint'Libravatar Junio C Hamano0-0/+0
2012-05-03Merge branch 'jc/merge-reduce-parents-early' into maintLibravatar Junio C Hamano5-71/+276
2012-05-03Merge branch 'cb/cherry-pick-rev-path-confusion' into maintLibravatar Junio C Hamano3-11/+19
2012-05-03Merge branch 'cb/http-multi-curl-auth' into maintLibravatar Junio C Hamano2-10/+26
2012-05-03Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintLibravatar Junio C Hamano2-4/+43
2012-05-03Merge branch 'rl/maint-stash-i18n-save-error' into maintLibravatar Junio C Hamano1-2/+2
2012-05-03Merge branch 'jm/maint-strncpy-diff-no-index' into maintLibravatar Junio C Hamano1-21/+17
2012-05-03Merge branch 'jk/maint-push-progress'Libravatar Junio C Hamano3-2/+39
2012-05-03Merge branch 'nd/columns'Libravatar Junio C Hamano27-48/+1105
2012-05-03doc/config: fix inline literalsLibravatar Jeff King1-2/+2
2012-05-02The eighth batch of topics graduated to 'master'Libravatar Junio C Hamano1-32/+42
2012-05-02Merge branch 'master' of git://git.bogomips.org/git-svnLibravatar Junio C Hamano1-7/+25
2012-05-02Merge branch 'tr/xdiff-fast-hash'Libravatar Junio C Hamano2-0/+118
2012-05-02Merge branch 'jk/maint-gitweb-test-use-sane-perl'Libravatar Junio C Hamano3-3/+3
2012-05-02Merge branch 'pw/message-cleanup'Libravatar Junio C Hamano15-24/+24
2012-05-02Merge branch 'zj/diff-stat-smaller-num-columns'Libravatar Junio C Hamano77-353/+400
2012-05-02Merge branch 'pw/p4-various'Libravatar Junio C Hamano4-35/+308
2012-05-02Merge branch 'jc/rerere-train'Libravatar Junio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 15:13:59 +0000