aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | Merge branch 'aj/xfuncname-ada'Junio C Hamano2012-09-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add userdiff patterns for AdaAdrian Johnson2012-09-16
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/maint-mailinfo-mime-attr'Junio C Hamano2012-09-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | mailinfo: do not concatenate charset= attribute values from mime headersJunio C Hamano2012-09-17
* | | | | | | | | | | | | Merge branch 'jc/maint-log-grep-all-match'Junio C Hamano2012-09-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | t7810-grep: test --all-match with multiple --grep and --author optionsMichael J Gruber2012-09-15
| * | | | | | | | | | | | t7810-grep: test interaction of multiple --grep and --author optionsMichael J Gruber2012-09-15
| * | | | | | | | | | | | t7810-grep: test multiple --author with --all-matchMichael J Gruber2012-09-15
| * | | | | | | | | | | | t7810-grep: test multiple --grep with and without --all-matchMichael J Gruber2012-09-15
| * | | | | | | | | | | | t7810-grep: bring log --grep tests in common formMichael J Gruber2012-09-15
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'pw/p4-submit-conflicts'Junio C Hamano2012-09-18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: add submit --conflict option and config varaiablePete Wyckoff2012-09-16
| * | | | | | | | | | | | git p4: add submit --prepare-p4-only optionPete Wyckoff2012-09-16
| * | | | | | | | | | | | git p4: add submit --dry-run optionPete Wyckoff2012-09-16
| * | | | | | | | | | | | git p4: revert deleted files after submit cancelPete Wyckoff2012-09-16
| * | | | | | | | | | | | git p4: test clean-up after failed submit, fix added filesPete Wyckoff2012-09-16
| * | | | | | | | | | | | git p4: standardize submit cancel due to unchanged templatePete Wyckoff2012-09-16
| * | | | | | | | | | | | git p4: move conflict prompt into run, add [q]uit inputPete Wyckoff2012-09-16
| * | | | | | | | | | | | git p4: gracefully fail if some commits could not be appliedPete Wyckoff2012-09-16
| * | | | | | | | | | | | git p4 test: remove bash-ism of combined export/assignmentPete Wyckoff2012-09-16
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mv/cherry-pick-s'Junio C Hamano2012-09-18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cherry-pick: don't forget -s on failureMiklos Vajna2012-09-14
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-09-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | t/perf: add "trash directory" to .gitignoreRamkumar Ramachandra2012-09-17
| * | | | | | | | | | | | Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Sync with 1.7.11.7Junio C Hamano2012-09-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11Junio C Hamano2012-09-14
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/test-regex' into maint-1.7.11Junio C Hamano2012-09-14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Junio C Hamano2012-09-12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2012-09-12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with 1.7.11.6Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/empty-rebase-test' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/test-prereq' into maintJunio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2012-09-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-send-email-2047' into maint-1.7.11Junio C Hamano2012-09-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fetch-filter-refs'Junio C Hamano2012-09-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: eliminate spurious error messagesMichael Haggerty2012-09-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: report missing refs even if no existing refs were receivedMichael Haggerty2012-09-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch_pack(): update sought->nr to reflect number of unique entriesMichael Haggerty2012-09-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5500: add tests of fetch-pack --all --depth=N $URL $REFMichael Haggerty2012-09-12