summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t6030: test bisecting with pathsChristian Couder2009-04-051-0/+60
* send-email: ensure quoted addresses are rfc2047 encodedJay Soffian2009-04-021-0/+13
* send-email: correct two tests which were going interactiveJay Soffian2009-04-021-3/+5
* Merge branch 'ef/fast-export'Junio C Hamano2009-04-011-0/+15
|\
| * builtin-fast-export.c: handle nested tagsErik Faye-Lund2009-03-291-2/+2
| * builtin-fast-export.c: fix crash on tagged treesErik Faye-Lund2009-03-291-3/+2
| * 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-011-0/+15
|\ \
| * | format-patch: add arbitrary email headersMichael Hendricks2009-03-271-0/+15
* | | Merge branch 'jc/maint-1.6.0-keep-pack'Junio C Hamano2009-04-011-0/+61
|\ \ \
| * | | pack-objects: don't loosen objects available in alternate or kept packsBrandon Casey2009-03-211-1/+1
| * | | t7700: demonstrate repack flaw which may loosen objects unnecessarilyBrandon Casey2009-03-211-0/+17
| * | | pack-objects: only repack or loosen objects residing in "local" packsBrandon Casey2009-03-201-1/+1
| * | | git-repack.sh: don't use --kept-pack-only option to pack-objectsBrandon Casey2009-03-201-1/+1
| * | | t7700-repack: add two new tests demonstrating repacking flawsBrandon Casey2009-03-201-0/+44
* | | | send-email: ask_default should apply to all emails, not just the firstJay Soffian2009-04-011-1/+3
* | | | send-email: add tests for refactored promptingJay Soffian2009-03-291-4/+48
* | | | Merge branch 'maint'Junio C Hamano2009-03-282-9/+1
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-282-9/+1
| |\ \ \ \
| | * | | | test-lib: Clean up comments and Makefile.Emil Sit2009-03-282-9/+1
| | * | | | Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1Junio C Hamano2009-03-212-19/+20
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1Junio C Hamano2009-03-211-0/+17
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-122-1/+33
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0Junio C Hamano2009-03-1221-2/+209
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0Junio C Hamano2009-03-121-0/+25
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0Junio C Hamano2009-03-121-1/+8
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0Junio C Hamano2009-03-121-0/+18
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1Junio C Hamano2009-03-121-0/+26
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1Junio C Hamano2009-03-121-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1Junio C Hamano2009-03-121-1/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1Junio C Hamano2009-03-121-0/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1Junio C Hamano2009-03-121-0/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1Junio C Hamano2009-03-1221-2/+209
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'tr/maint-1.6.0-send-email-irt' into maintJunio C Hamano2009-03-211-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/maint-submodule-normalize-path' into maintJunio C Hamano2009-03-211-0/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/rsync-local' into maintJunio C Hamano2009-03-211-19/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maintJunio C Hamano2009-03-211-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-send-email' into maintJunio C Hamano2009-03-111-25/+167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fg/maint-exclude-bq' into maintJunio C Hamano2009-03-111-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano2009-03-281-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-221-0/+8
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/reflog-date'Junio C Hamano2009-03-261-0/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | make oneline reflog dates more consistent with multiline formatJeff King2009-03-201-0/+67
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/attributes-checkout'Junio C Hamano2009-03-261-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add a test for checking whether gitattributes is honored by checkout.Kristian Amlie2009-03-201-0/+31
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-diff-temp-smudge'Junio C Hamano2009-03-261-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-221-0/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was'Junio C Hamano2009-03-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | fast-export: Avoid dropping files from commitsElijah Newren2009-03-251-2/+5