summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-01-10Merge branch 'maint-1.6.2' into maintLibravatar Junio C Hamano2-13/+11
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Libravatar Junio C Hamano8-43/+47
2010-01-10Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano4-28/+28
2010-01-09daemon: consider only address in kill_some_child()Libravatar Erik Faye-Lund1-8/+20
2010-01-09help: fix configured help format taking over command line oneLibravatar Christian Couder1-1/+8
2010-01-09string-list: rename the include guard to STRING_LIST_HLibravatar Thiago Farina1-3/+3
2010-01-09t7111: check that reset options work as described in the tablesLibravatar Christian Couder1-0/+113
2010-01-09base85: Make the code more obvious instead of explaining the non-obviousLibravatar Andreas Gruenbacher1-8/+2
2010-01-09base85: encode_85() does not use the decode tableLibravatar Andreas Gruenbacher1-2/+0
2010-01-09base85 debug code: Fix length byte calculationLibravatar Andreas Gruenbacher1-1/+1
2010-01-09Documentation: tiny git config manual tweaksLibravatar Jonathan Nieder1-4/+4
2010-01-09Documentation: git gc packs refs by default nowLibravatar Jonathan Nieder1-9/+6
2010-01-09Reset possible helper before reusing remote structureLibravatar Ilari Liusvaara1-0/+3
2010-01-07Describe second batch for 1.7.0 in draft release notesLibravatar Junio C Hamano1-1/+7
2010-01-07Merge branch 'js/filter-branch-prime'Libravatar Junio C Hamano1-1/+0
2010-01-07Merge branch 'sb/maint-octopus'Libravatar Junio C Hamano2-9/+57
2010-01-07Merge branch 'mg/tag-d-show'Libravatar Junio C Hamano1-1/+3
2010-01-07Merge branch 'so/cvsserver-update'Libravatar Junio C Hamano1-0/+16
2010-01-07Merge branch 'bg/maint-add-all-doc'Libravatar Junio C Hamano2-29/+88
2010-01-07git-rm doc: Describe how to sync index & work treeLibravatar Björn Gustavsson1-1/+53
2010-01-07Merge branch 'mv/commit-date'Libravatar Junio C Hamano5-2/+53
2010-01-07Merge branch 'mo/bin-wrappers'Libravatar Junio C Hamano6-32/+93
2010-01-07rebase -i: teach --onto A...B syntaxLibravatar Nanako Shiraishi2-1/+50
2010-01-07rebase: fix --onto A...B parsing and add testsLibravatar Nanako Shiraishi2-14/+94
2010-01-06checkout -m: do not try to fall back to --merge from an unborn branchLibravatar Junio C Hamano1-2/+8
2010-01-06t7002: test for not using external grep on skip-worktree pathsLibravatar Nguyễn Thái Ngọc Duy2-0/+13
2010-01-06t7002: set test prerequisite "external-grep" if supportedLibravatar Nguyễn Thái Ngọc Duy1-0/+12
2010-01-06checkout -m path: fix recreating conflictsLibravatar Junio C Hamano2-1/+58
2010-01-06.gitattributes: detect 8-space indent in shell scriptsLibravatar Junio C Hamano1-0/+1
2010-01-06Makefile: consolidate .FORCE-* targetsLibravatar Jonathan Nieder2-11/+8
2010-01-06Makefile: learn to generate listings for targets requiring special flagsLibravatar Jonathan Nieder1-7/+7
2010-01-06Makefile: use target-specific variable to pass flags to ccLibravatar Jonathan Nieder1-23/+18
2010-01-06Makefile: regenerate assembler listings when askedLibravatar Jonathan Nieder1-2/+2
2010-01-06Smart-http tests: Test http-backend without curl or a webserverLibravatar Tarmigan Casebolt2-6/+25
2010-01-06Smart-http tests: Break test t5560-http-backend into piecesLibravatar Tarmigan Casebolt3-147/+173
2010-01-06Smart-http tests: Improve coverage in test t5560Libravatar Tarmigan Casebolt1-11/+10
2010-01-06Smart-http: check if repository is OK to export before serving itLibravatar Tarmigan Casebolt4-2/+55
2010-01-06t/lib-http.sh: Restructure finding of default httpd locationLibravatar Tarmigan Casebolt1-6/+24
2010-01-05t4030, t4031: work around bogus MSYS bash path conversionLibravatar Johannes Sixt2-2/+2
2010-01-05diff: run external diff helper with shellLibravatar Jeff King1-1/+1
2010-01-05textconv: use shell to run helperLibravatar Jeff King3-2/+3
2010-01-05editor: use run_command's shell featureLibravatar Jeff King1-19/+2
2010-01-05run-command: optimize out useless shell callsLibravatar Jeff King1-9/+11
2010-01-05run-command: convert simple callsites to use_shellLibravatar Jeff King4-12/+10
2010-01-05t0021: use $SHELL_PATH for the filter scriptLibravatar Johannes Sixt1-1/+2
2010-01-05Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGSLibravatar Jonathan Nieder1-1/+1
2010-01-04Documentation: reset: add some missing tablesLibravatar Christian Couder1-6/+29
2010-01-04Fix bit assignment for CE_CONFLICTEDLibravatar Junio C Hamano1-1/+1
2010-01-03Use warning function instead of fprintf(stderr, "Warning: ...").Libravatar Thiago Farina4-7/+5
2010-01-03"reset --merge": fix unmerged caseLibravatar Junio C Hamano5-20/+49