summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
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-07-09Restore umasks influence on the permissions of work tree created by cloneLibravatar Alex Riesen1-1/+1
2012-07-09Allow edit of empty message with commit --amendLibravatar Chris Webb2-1/+16
2012-07-09Merge git://github.com/git-l10n/git-poLibravatar Junio C Hamano5-1090/+1727
2012-07-09Fifth batch for 1.7.12Libravatar Junio C Hamano1-0/+43
2012-07-09Merge branch 'cw/help-over-network'Libravatar Junio C Hamano1-4/+15
2012-07-09Merge branch 'mz/empty-rebase-test'Libravatar Junio C Hamano1-0/+8
2012-07-09Merge branch 'pw/git-p4-tests'Libravatar Junio C Hamano9-433/+574
2012-07-09Merge branch 'js/fast-export-paths-with-spaces'Libravatar Junio C Hamano2-1/+3
2012-07-09Merge branch 'cw/no-detaching-an-unborn'Libravatar Junio C Hamano2-0/+8
2012-07-09Merge branch 'vr/use-our-perl-in-tests'Libravatar Junio C Hamano26-44/+65
2012-07-09Merge branch 'mm/credential-plumbing'Libravatar Junio C Hamano13-97/+330
2012-07-09Merge branch 'jc/maint-blame-unique-abbrev'Libravatar Junio C Hamano1-4/+21
2012-07-09Merge branch 'jn/perl-makemaker-leading-paths'Libravatar Junio C Hamano1-2/+14
2012-07-09Merge branch 'rj/platform-pread-may-be-thread-unsafe'Libravatar Junio C Hamano2-2/+10
2012-07-09Merge branch 'mm/config-xdg'Libravatar Junio C Hamano11-33/+272
2012-07-09Makefile: document ground rules for target-specific dependenciesLibravatar Jonathan Nieder1-0/+33
2012-07-09Makefile: move GIT-VERSION-FILE dependencies closer to useLibravatar Jeff King1-9/+4
2012-07-09Makefile: build instaweb similar to other scriptsLibravatar Jeff King1-8/+6
2012-07-09Makefile: update scripts when build-time parameters changeLibravatar Jeff King2-3/+14
2012-07-09Makefile: do not replace @@GIT_VERSION@@ in shell scriptsLibravatar Jeff King1-3/+0
2012-07-09Makefile: split prefix flags from GIT-CFLAGSLibravatar Jeff King2-8/+23
2012-07-09Makefile: be silent when only GIT_USER_AGENT changesLibravatar Jonathan Nieder1-1/+0
2012-07-09Makefile: split GIT_USER_AGENT from GIT-CFLAGSLibravatar Jeff King2-2/+10
2012-07-09Makefile: do not replace @@GIT_USER_AGENT@@ in scriptsLibravatar Jeff King1-1/+0
2012-07-09Makefile: apply dependencies consistently to sparse/asm targetsLibravatar Jeff King1-2/+2
2012-07-09Makefile: do not have git.o depend on common-cmds.hLibravatar Jeff King1-1/+0
2012-07-09Makefile: fold XDIFF_H and VCSSVN_H into LIB_HLibravatar Jonathan Nieder1-37/+25
2012-07-08git on Mac OS and precomposed unicodeLibravatar Torsten Bögershausen13-10/+446
2012-07-08Replace strlen() with ce_namelen()Libravatar Thomas Gummerer2-3/+3
2012-07-08git-remote-mediawiki: update comments to reflect credential supportLibravatar Matthieu Moy1-6/+1
2012-07-06git-remote-mediawiki: be more defensive when requests failLibravatar Matthieu Moy1-0/+8
2012-07-06git-remote-mediawiki: more efficient 'pull' in the best caseLibravatar Matthieu Moy2-21/+110
2012-07-06git-remote-mediawiki: extract revision-importing loop to a functionLibravatar Matthieu Moy1-3/+13
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 05:39:33 +0000