summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* push: switch default from "matching" to "simple"gj/push-more-verbose-adviceJunio C Hamano2013-11-135-42/+18
* push: enhance unspecified push default warningGreg Jacobson2013-11-131-0/+7
* Git 1.8.5-rc1v1.8.5-rc1Junio C Hamano2013-11-061-1/+1
* Merge branch 'fc/trivial'Junio C Hamano2013-11-0616-41/+30
|\
| * setup: trivial style fixesFelipe Contreras2013-10-311-2/+2
| * run-command: trivial style fixesFelipe Contreras2013-10-311-8/+5
| * diff: trivial style fixFelipe Contreras2013-10-311-1/+1
| * revision: trivial style fixesFelipe Contreras2013-10-311-8/+6
| * pretty: trivial style fixFelipe Contreras2013-10-311-1/+1
| * describe: trivial style fixesFelipe Contreras2013-10-311-4/+3
| * transport-helper: trivial style fixFelipe Contreras2013-10-311-0/+1
| * sha1-name: trivial style cleanupFelipe Contreras2013-10-311-1/+0
| * branch: trivial style fixFelipe Contreras2013-10-311-2/+1
| * revision: add missing includeFelipe Contreras2013-10-311-0/+1
| * doc/pull: clarify the illustrationsJunio C Hamano2013-10-311-1/+3
| * t: replace pulls with mergesFelipe Contreras2013-10-314-4/+4
| * merge: simplify ff-only optionFelipe Contreras2013-10-311-9/+2
* | 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
| | |_|/ / / / / / / / / | |/| | | | | | | | | |