summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-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
2010-01-03reset: use "unpack_trees()" directly instead of "git read-tree"Libravatar Stephan Beyer3-17/+38
2010-01-02Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-01-02stash: mention --patch in usage string.Libravatar Matthieu Moy1-1/+1
2010-01-01run-command: add "use shell" optionLibravatar Jeff King2-0/+49
2009-12-31Merge branch 'maint'Libravatar Junio C Hamano5-21/+37
2009-12-31Merge branch 'maint-1.6.0' into maintLibravatar Junio C Hamano2-15/+17
2009-12-31branch: die explicitly why when calling "git branch [-a|-r] branchname".Libravatar Matthieu Moy2-15/+17
2009-12-31fast-import: Document author/committer/tagger name is optionalLibravatar Shawn O. Pearce2-6/+6
2009-12-31SubmittingPatches: hints to know the status of a submitted patch.Libravatar Matthieu Moy1-0/+14
2009-12-31bash completion: factor submodules into dirty stateLibravatar Thomas Rast1-4/+2
2009-12-31Fix "git remote update" with remotes.defalt setLibravatar Björn Gustavsson2-6/+18
2009-12-31builtin-config: add --path option doing ~ and ~user expansion.Libravatar Matthieu Moy3-4/+58
2009-12-31cvsserver: make the output of 'update' more compatible with cvs.Libravatar Sergei Organov1-0/+16
2009-12-30bash completion: add space between branch name and status flagsLibravatar Shawn O. Pearce1-5/+2
2009-12-30grep: do not do external grep on skip-worktree entriesLibravatar Nguyễn Thái Ngọc Duy1-1/+17
2009-12-30CVS Server: Support reading base and roots from environmentLibravatar Phil Miller2-1/+36