summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Makefile: Make dependency directory creation less noisyrj/quietly-create-dep-dirRamsay Jones2011-09-111-1/+1
* Makefile: lazily compute header dependenciesJonathan Nieder2010-01-262-5/+45
* Makefile: list generated object files in OBJECTSJonathan Nieder2010-01-261-2/+7
* Makefile: disable default implicit rulesJonathan Nieder2010-01-261-0/+2
* Makefile: rearrange dependency rulesJonathan Nieder2010-01-261-24/+25
* Makefile: transport.o depends on branch.h nowJonathan Nieder2010-01-261-1/+1
* Merge branch 'master' of git://repo.or.cz/alt-git into jn/autodepJonathan Nieder2010-01-26414-3660/+14975
|\
| * am: fix patch format detection for Thunderbird "Save As" emailsStephen Boyd2010-01-252-1/+17
| * t0022: replace non-portable literal CRStephen Boyd2010-01-251-1/+1
| * tests: consolidate CR removal/addition functionsStephen Boyd2010-01-256-58/+37
| * commit-tree: remove unused #defineStephen Boyd2010-01-251-2/+0
| * t5541-http-push: make grep expression check for one line onlyTay Ray Chuan2010-01-251-8/+4
| * rebase: replace antiquated sed invocationStephen Boyd2010-01-251-4/+2
| * Add test-run-command to .gitignoreAlejandro Riveira Fernández2010-01-251-0/+1
| * git_connect: use use_shell instead of explicit "sh", "-c"Johannes Sixt2010-01-251-2/+1
| * gitweb.js: Workaround for IE8 bugv1.7.0-rc0Jakub Narebski2010-01-241-1/+6
| * Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-2419-140/+734
| |\
| | * read-tree --debug-unpackJunio C Hamano2010-01-073-0/+72
| | * unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-075-7/+140
| | * unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-074-65/+173
| | * Aggressive three-way merge: fix D/F caseJunio C Hamano2010-01-032-6/+9
| | * traverse_trees(): handle D/F conflict case sanelyJunio C Hamano2010-01-033-46/+237
| | * more D/F conflict testsJunio C Hamano2010-01-031-0/+102
| | * tests: move convenience regexp to match object names to test-lib.shJunio C Hamano2010-01-039-18/+6
| * | Make test numbers uniqueJohannes Sixt2010-01-241-0/+0
| * | Merge branch 'maint'Junio C Hamano2010-01-245-23/+48
| |\ \
| * | | Windows: Remove dependency on pthreadGC2.dllMichael Lukashov2010-01-241-1/+3
| * | | Documentation: move away misplaced 'push --upstream' descriptionThomas Rast2010-01-241-7/+7
| * | | Documentation: add missing :: in config.txtThomas Rast2010-01-241-1/+1
| * | | Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastJunio C Hamano2010-01-243-80/+102
| |\ \ \
| | * | | Documentation: merge: use MERGE_HEAD to refer to the remote branchJonathan Nieder2010-01-241-6/+8
| | * | | Documentation: simplify How Merge WorksJonathan Nieder2010-01-241-36/+16
| | * | | Documentation: merge: add a section about fast-forwardJonathan Nieder2010-01-241-13/+18
| | * | | Documentation: emphasize when git merge terminates earlyJonathan Nieder2010-01-241-10/+21
| | * | | Documentation: merge: add an overviewJonathan Nieder2010-01-241-2/+26
| | * | | Documentation: merge: move merge strategy list to endJonathan Nieder2010-01-241-2/+2
| | * | | Documentation: suggest `reset --merge` in How Merge Works sectionJonathan Nieder2010-01-241-3/+3
| | * | | Documentation: merge: move configuration section to endJonathan Nieder2010-01-241-9/+9
| | * | | Documentation: emphasise 'git shortlog' in its synopsisThomas Rast2010-01-101-1/+1
| | * | | Documentation: show-files is now called git-ls-filesThomas Rast2010-01-101-1/+1
| | * | | Documentation: tiny git config manual tweaksJonathan Nieder2010-01-101-4/+4
| | * | | Documentation: git gc packs refs by default nowJonathan Nieder2010-01-101-9/+6
| * | | | pull: re-fix command line generationJunio C Hamano2010-01-242-1/+36
| * | | | rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano2010-01-231-4/+4
| * | | | Documentation: rev-list: fix synopsys for --tags and and --remotesChristian Couder2010-01-231-2/+2
| * | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2010-01-239-162/+1018
| |\ \ \ \
| | * | | | git-svn: allow subset of branches/tags to be specified in glob specJay Soffian2010-01-234-20/+320
| | * | | | git-svn: allow UUID to be manually remapped via rewriteUUIDJay Soffian2010-01-234-8/+140
| | * | | | git-svn: update svn mergeinfo test suiteAndrew Myrick2010-01-233-127/+485
| | * | | | git-svn: document --username/commit-url for branch/tagIgor Mironov2010-01-231-0/+13