summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* sha1-lookup: fix up the assertion messageJunio C Hamano2009-04-061-1/+1
* patch-ids: use the new generic "sha1_pos" function to lookup sha1Christian Couder2009-04-041-88/+5
* sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1Christian Couder2009-04-042-0/+108
* Update draft release notes to 1.6.3Junio C Hamano2009-04-021-2/+19
* Sync with 1.6.2.2Junio C Hamano2009-04-022-12/+9
|\
| * GIT 1.6.2.2v1.6.2.2Junio C Hamano2009-04-022-7/+10
| * Merge branch 'jc/maint-1.6.0-blame-s' into maintJunio C Hamano2009-04-021-4/+4
| |\
| * \ Merge branch 'js/maint-diff-temp-smudge' into maintJunio C Hamano2009-04-022-3/+26
| |\ \
| * \ \ Merge branch 'js/maint-1.6.0-exec-path-env' into maintJunio C Hamano2009-04-021-0/+4
| |\ \ \
| * \ \ \ Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintJunio C Hamano2009-04-022-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maintJunio C Hamano2009-04-021-9/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dm/maint-docco' into maintJunio C Hamano2009-04-0210-230/+234
| |\ \ \ \ \ \
* | | | | | | | send-email: ensure quoted addresses are rfc2047 encodedJay Soffian2009-04-022-1/+15
* | | | | | | | send-email: correct two tests which were going interactiveJay Soffian2009-04-021-3/+5
* | | | | | | | Merge branch 'ef/fast-export'Junio C Hamano2009-04-012-2/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-fast-export.c: handle nested tagsErik Faye-Lund2009-03-292-3/+6
| * | | | | | | | builtin-fast-export.c: fix crash on tagged treesErik Faye-Lund2009-03-292-3/+6
| * | | | | | | | builtin-fast-export.c: turn error into warningErik Faye-Lund2009-03-291-2/+4
| * | | | | | | | test-suite: adding a test for fast-export with tag variantsErik Faye-Lund2009-03-291-0/+16
* | | | | | | | | Merge branch 'mh/format-patch-add-header'Junio C Hamano2009-04-013-0/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: add arbitrary email headersMichael Hendricks2009-03-273-0/+22
* | | | | | | | | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root'Junio C Hamano2009-04-011-9/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Documentation: format-patch --root clarificationsThomas Rast2009-03-271-9/+12
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-04-013-2/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-011-1/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-011-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Documentation: Remove an odd "instead"Holger Weiß2009-04-011-1/+1
| * | | | | | | | | | | fix portability problem with IS_RUN_COMMAND_ERRJeff King2009-04-011-1/+1
| * | | | | | | | | | | mailmap: resurrect lower-casing of email addressesJohannes Schindelin2009-04-011-0/+9
* | | | | | | | | | | | Merge branch 'cj/doc-format'Junio C Hamano2009-04-019-88/+208
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is setChris Johnsen2009-04-014-14/+32
| * | | | | | | | | | | | Merge branch 'cj/doc-quiet' into cj/doc-formatJunio C Hamano2009-03-271-31/+60
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Documentation/Makefile: break up texi pipelineChris Johnsen2009-03-271-4/+7
| | * | | | | | | | | | | | Documentation/Makefile: make most operations "quiet"Chris Johnsen2009-03-271-29/+55
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Documentation: option to render literal text as bold for manpagesChris Johnsen2009-03-272-1/+22
| * | | | | | | | | | | | Documentation: asciidoc.conf: fix verse block with block titlesChris Johnsen2009-03-271-1/+2
| * | | | | | | | | | | | Documentation: asciidoc.conf: always use <literallayout> for [blocktext]Chris Johnsen2009-03-271-2/+2
| * | | | | | | | | | | | Documentation: move "spurious .sp" code into manpage-base.xslChris Johnsen2009-03-272-13/+13
| * | | | | | | | | | | | Documentation: move quieting params into manpage-base.xslChris Johnsen2009-03-272-4/+4
| * | | | | | | | | | | | Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roffChris Johnsen2009-03-272-5/+32
| * | | | | | | | | | | | Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xslChris Johnsen2009-03-273-52/+46
| * | | | | | | | | | | | Documentation: move callouts.xsl to manpage-{base,normal}.xslChris Johnsen2009-03-273-1/+31
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack'Junio C Hamano2009-04-017-39/+91
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: don't loosen objects available in alternate or kept packsBrandon Casey2009-03-212-2/+26
| * | | | | | | | | | | | t7700: demonstrate repack flaw which may loosen objects unnecessarilyBrandon Casey2009-03-211-0/+17
| * | | | | | | | | | | | Remove --kept-pack-only option and associated infrastructureBrandon Casey2009-03-205-31/+2
| * | | | | | | | | | | | pack-objects: only repack or loosen objects residing in "local" packsBrandon Casey2009-03-202-3/+3
| * | | | | | | | | | | | git-repack.sh: don't use --kept-pack-only option to pack-objectsBrandon Casey2009-03-202-6/+2
| * | | | | | | | | | | | t7700-repack: add two new tests demonstrating repacking flawsBrandon Casey2009-03-201-0/+44
* | | | | | | | | | | | | Merge branch 'kb/tracking-count-no-merges'Junio C Hamano2009-04-011-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \