summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t: trivial whitespace cleanupsFelipe Contreras2013-12-092-3/+1
* Merge branch 'jk/remove-experimental-loose-object-support'Junio C Hamano2013-12-0618-69/+0
|\
| * drop support for "experimental" loose objectsjk/remove-experimental-loose-object-supportJeff King2013-11-2118-69/+0
* | Merge branch 'nd/magic-pathspec'Junio C Hamano2013-12-061-0/+6
|\ \
| * | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-201-0/+6
* | | Merge branch 'rr/for-each-ref-decoration'Junio C Hamano2013-12-061-13/+56
|\ \ \
| * | | for-each-ref: avoid color leakagerr/for-each-ref-decorationRamkumar Ramachandra2013-11-191-1/+1
| * | | for-each-ref: introduce %(color:...) for colorRamkumar Ramachandra2013-11-191-0/+17
| * | | for-each-ref: introduce %(upstream:track[short])Ramkumar Ramachandra2013-11-191-0/+27
| * | | for-each-ref: introduce %(HEAD) asterisk markerRamkumar Ramachandra2013-11-181-0/+2
| * | | t6300 (for-each-ref): don't hardcode SHA-1 hexesRamkumar Ramachandra2013-11-181-8/+8
| * | | t6300 (for-each-ref): clearly demarcate setupRamkumar Ramachandra2013-11-181-5/+2
* | | | Merge branch 'rh/remote-hg-bzr-updates'Junio C Hamano2013-12-061-0/+4
|\ \ \ \
| * | | | test-lib.sh: convert $TEST_DIRECTORY to an absolute pathFelipe Contreras2013-11-181-0/+4
* | | | | Merge branch 'jl/submodule-update-retire-orig-flags'Junio C Hamano2013-12-051-0/+11
|\ \ \ \ \
| * | | | | submodule update: remove unnecessary orig_flags variablejl/submodule-update-retire-orig-flagsJens Lehmann2013-11-111-0/+11
| |/ / / /
* | | | | Merge branch 'sb/sha1-loose-object-info-check-existence'Junio C Hamano2013-12-051-0/+6
|\ \ \ \ \
| * | | | | sha1_loose_object_info(): do not return success on missing objectsb/sha1-loose-object-info-check-existenceJunio C Hamano2013-11-061-0/+6
* | | | | | Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano2013-12-052-89/+104
|\ \ \ \ \ \
| * | | | | | t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fixJunio C Hamano2013-11-041-0/+15
| * | | | | | t1005: reindentJunio C Hamano2013-11-042-89/+89
* | | | | | | Merge branch 'jc/ref-excludes'Junio C Hamano2013-12-051-0/+54
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: introduce --exclude=<glob> to tame wildcardsjc/ref-excludesJunio C Hamano2013-11-011-0/+12
| * | | | | | | rev-list --exclude: testsJunio C Hamano2013-11-011-0/+42
* | | | | | | | Merge branch 'nv/parseopt-opt-arg'Junio C Hamano2013-12-051-3/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse --parseopt: add the --stuck-long modenv/parseopt-opt-argNicolas Vigier2013-10-311-3/+39
* | | | | | | | | Merge branch 'jc/merge-base-reflog'Junio C Hamano2013-12-051-0/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge-base: teach "--fork-point" modejc/merge-base-reflogJunio C Hamano2013-10-291-0/+28
* | | | | | | | | | Merge branch 'ak/submodule-foreach-quoting'Junio C Hamano2013-12-051-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule foreach: skip eval for more than one argumentak/submodule-foreach-quotingAnders Kaseorg2013-09-271-0/+9
* | | | | | | | | | | Sync with 1.8.4.5Junio C Hamano2013-12-021-0/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule: do not copy unknown update mode from .gitmodulesJunio C Hamano2013-12-021-0/+15
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'jn/test-prereq-perl-doc' into maintJunio C Hamano2013-11-081-4/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/upload-pack-send-symref' into maintJunio C Hamano2013-11-083-12/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-auth-redirects' into maintJunio C Hamano2013-11-083-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/checkout-auto-track-fix' into maintJunio C Hamano2013-11-072-0/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/split-broken-ident' into maintJunio C Hamano2013-11-071-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano2013-11-071-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | t5570: Update for clone-progress-to-stderr branchBrian Gernhardt2013-10-301-2/+1
* | | | | | | | | | | | | | | | Merge branch 'nd/literal-pathspecs'Junio C Hamano2013-11-181-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesnd/literal-pathspecsnd/liteal-pathspecsNguyễn Thái Ngọc Duy2013-10-281-0/+7
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-11-181-11/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | branch: fix --verbose output column alignmentjx/branch-vv-always-compare-with-upstreamTorstein Hegge2013-11-181-11/+13
* | | | | | | | | | | | | | | | Merge branch 'fc/trivial'Junio C Hamano2013-11-064-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t: replace pulls with mergesFelipe Contreras2013-10-314-4/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'bw/solaris-sed-tr-test-portability'Junio C Hamano2013-11-042-14/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t4015: simplify sed command that is not even seen by sedbw/solaris-sed-tr-test-portabilityJunio C Hamano2013-11-041-1/+0
| * | | | | | | | | | | | | | | | Avoid difference in tr semantics between System V and BSDBen Walton2013-10-301-12/+18
| * | | | | | | | | | | | | | | | Change sed i\ usage to something Solaris' sed can handleBen Walton2013-10-281-2/+4
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/duplicate-objects-in-packs'Junio C Hamano2013-11-041-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \