summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-08-271-1/+1
|\
| * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-08-271-1/+1
| |\
| | * Documentation: git-archive: mark --format as optional in summaryWesley J. Landaker2009-08-271-1/+1
| | * Merge branch 'maint-1.5.6' into maint-1.6.0Junio C Hamano2009-08-272-2/+43
| | |\
* | | | Round-down years in "years+months" relative date viewDavid Reiss2009-08-271-1/+1
* | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-08-072-11/+27
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-08-072-11/+27
| |\ \ \ | | |/ /
| | * | verify-pack -v: do not report "chain length 0"Junio C Hamano2009-08-071-8/+19
| | * | t5510: harden the way verify-pack is usedJunio C Hamano2009-08-071-3/+8
* | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-06-203-7/+7
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-06-203-7/+7
| |\ \ \ | | |/ /
| | * | git-show-ref.txt: remove word and make consistentStephen Boyd2009-06-201-2/+2
| | * | git-svn documentation: fix typo in 'rebase vs. pull/merge' sectionMiklos Vajna2009-06-201-1/+1
| | * | use xstrdup, not strdup in ll-merge.cJim Meyering2009-06-141-4/+4
* | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-06-131-33/+32
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-06-132-34/+34
| |\ \ \ | | |/ /
| | * | git-rerere.txt: grammatical fixups and cleanupsStephen Boyd2009-06-131-33/+32
* | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-241-1/+2
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-241-1/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | http-push.c::remove_locks(): fix use after freeAlex Riesen2009-05-241-1/+2
* | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-131-1/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-131-1/+3
| |\ \ \ | | |/ /
| | * | ls-tree manpage: output of ls-tree is compatible with update-indexAlex Riesen2009-05-101-0/+2
| | * | ls-tree manpage: use "unless" instead of "when ... is not"Alex Riesen2009-05-101-1/+1
* | | | Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2Junio C Hamano2009-05-122-8/+29
|\ \ \ \
| * | | | Revert "checkout branch: prime cache-tree fully"Junio C Hamano2009-05-122-8/+29
* | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-080-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-081-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maintJunio C Hamano2009-05-051-1/+1
|\ \ \ \ \
| * | | | | git-svn: fix a sloppy Getopt::Long usageRobin H. Johnson2009-05-051-1/+1
* | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-05-051-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | dir.c: Fix two minor grammatical errors in commentsAllan Caffee2009-05-051-2/+2
| |/ / / /
* | | | | improve error message in config.cAlex Riesen2009-05-051-1/+1
* | | | | t4018-diff-funcname: add cpp xfuncname pattern to syntax testBrandon Casey2009-05-051-1/+1
* | | | | Work around BSD whose typeof(tv.tv_sec) != time_tBernd Ahlers2009-05-051-1/+3
* | | | | git-am.txt: reword extra headers in message bodyStephen Boyd2009-05-051-4/+4
* | | | | git-am.txt: Use date or value instead of time or timestampStephen Boyd2009-05-051-4/+4
* | | | | git-am.txt: add an 'a', say what 'it' is, simplify a sentenceStephen Boyd2009-05-051-6/+6
* | | | | GIT 1.6.2.5v1.6.2.5Junio C Hamano2009-05-033-2/+23
* | | | | Merge branch 'np/maint-no-ofs-delta' into maintJunio C Hamano2009-05-031-1/+12
|\ \ \ \ \
| * | | | | honor repack.usedeltabaseoffset when fetching packsNicolas Pitre2009-05-011-1/+12
* | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-05-031-0/+25
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | GIT 1.6.1.4v1.6.1.4Junio C Hamano2009-05-032-1/+26
| * | | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-0311-74/+105
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-032-1/+17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano2009-05-034-5/+29
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jc/maint-read-tree-multi' into maintJunio C Hamano2009-05-034-41/+55
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | checkout branch: prime cache-tree fullyJunio C Hamano2009-04-201-1/+8
| * | | | | | | | read-tree -m A B: prime cache-tree from the switched-to treeJunio C Hamano2009-04-201-0/+5
| * | | | | | | | Move prime_cache_tree() to cache-tree.cJunio C Hamano2009-04-204-36/+40