summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wt-status: take the alignment burden off translatorsnd/wt-status-align-i18nNguyễn Thái Ngọc Duy2013-11-061-27/+53
* Update draft release notes to 1.8.5Junio C Hamano2013-11-041-0/+17
* 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 'vd/doc-unpack-objects'Junio C Hamano2013-11-041-1/+1
|\ \
| * | Documentation: "pack-file" is not literal in unpack-objectsvd/doc-unpack-objectsVivien Didelot2013-11-011-1/+1
| * | Documentation: restore a space in unpack-objects usageVivien Didelot2013-10-311-1/+1
* | | Merge branch 'jk/duplicate-objects-in-packs'Junio C Hamano2013-11-041-4/+4
|\ \ \
| * | | Fix '\%o' for printf from coreutilsjk/duplicate-objects-in-packsKacper Kornet2013-10-311-4/+4
* | | | Merge branch 'jk/subtree-install-fix'Junio C Hamano2013-11-041-1/+6
|\ \ \ \
| * | | | subtree: add makefile target for html docsjk/subtree-install-fixJeff King2013-10-301-1/+6
* | | | | Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'Junio C Hamano2013-11-041-5/+5
|\ \ \ \ \
| * | | | | cvsserver: Determinize output to combat Perl 5.18 hash randomizationak/cvsserver-stabilize-use-of-hash-keysAnders Kaseorg2013-10-301-5/+5
* | | | | | Merge branch 'jk/wrap-perl-used-in-tests'Junio C Hamano2013-11-0429-54/+62
|\ \ \ \ \ \
| * | | | | | t: use perl instead of "$PERL_PATH" where applicablejk/wrap-perl-used-in-testsJeff King2013-10-2928-50/+50
| * | | | | | t: provide a perl() function which uses $PERL_PATHJeff King2013-10-292-4/+12
* | | | | | | Merge branch 'sc/doc-howto-dumb-http'Junio C Hamano2013-11-041-0/+4
|\ \ \ \ \ \ \
| * | | | | | | doc/howto: warn about (dumb)http server document being too oldsc/doc-howto-dumb-httpSitaram Chamarty2013-10-281-0/+4
* | | | | | | | Merge branch 'jn/test-prereq-perl-doc'Junio C Hamano2013-11-041-4/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | t/README: tests can use perl even with NO_PERLjn/test-prereq-perl-docJonathan Nieder2013-10-281-4/+11
* | | | | | | | | Update draft release notes to 1.8.5Junio C Hamano2013-11-011-6/+19
* | | | | | | | | Merge branch 'sb/refs-code-cleanup'Junio C Hamano2013-11-014-21/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cache: remove unused function 'have_git_dir'sb/refs-code-cleanupStefan Beller2013-10-282-6/+0
| * | | | | | | | | refs: remove unused function invalidate_ref_cacheStefan Beller2013-10-282-15/+0
* | | | | | | | | | Merge branch 'rs/web-browse-xdg-open'Junio C Hamano2013-11-012-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | web--browse: Add support for xdg-openrs/web-browse-xdg-openRüdiger Sonderfeld2013-10-302-3/+4
* | | | | | | | | | | Merge branch 'js/tests-windows-port-fix'Junio C Hamano2013-11-016-14/+72
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tests: undo special treatment of CRLF for Windowsjs/tests-windows-port-fixJohannes Sixt2013-10-283-9/+0
| * | | | | | | | | | | Windows: a test_cmp that is agnostic to random LF <> CRLF conversionsJohannes Sixt2013-10-282-0/+67
| * | | | | | | | | | | t5300-pack-object: do not compare binary data using test_cmpJohannes Sixt2013-10-281-5/+5
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/test-help-format-windows-port-fix'Junio C Hamano2013-11-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is htmljs/test-help-format-windows-port-fixJohannes Sixt2013-10-301-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/reset-p-current-head-fix'Junio C Hamano2013-11-014-16/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reset: pass real rev name to add--interactivejk/reset-p-current-head-fixJeff King2013-10-253-7/+10
| * | | | | | | | | | | add-interactive: handle unborn branch in patch modeJeff King2013-10-251-9/+13
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/pack-corruption-post-mortem'Junio C Hamano2013-11-012-0/+243
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | howto: add article on recovering a corrupted objectJeff King2013-10-252-0/+243
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/for-each-ref-skip-parsing'Junio C Hamano2013-11-012-9/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | for-each-ref: avoid loading objects to print %(objectname)jk/for-each-ref-skip-parsingJeff King2013-10-302-9/+24
* | | | | | | | | | | | Merge branch 'ap/remote-hg-unquote-cquote'Junio C Hamano2013-11-011-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remote-hg: unquote C-style paths when exportingap/remote-hg-unquote-cquoteAntoine Pelisse2013-10-231-0/+6
* | | | | | | | | | | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-11-012-4/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mv: Fix spurious warning when moving a file in presence of submodulesjl/submodule-mvJens Lehmann2013-10-132-4/+35
* | | | | | | | | | | | | | Git 1.8.5-rc0v1.8.5-rc0Junio C Hamano2013-10-302-1/+24
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-10-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t5570: Update for clone-progress-to-stderr branchBrian Gernhardt2013-10-301-2/+1
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/refs-c-squelch-gcc'Junio C Hamano2013-10-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | silence gcc array-bounds warningjk/refs-c-squelch-gccJeff King2013-10-241-1/+1