summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* submodule update: remove unnecessary orig_flags variablejl/submodule-update-retire-orig-flagsJens Lehmann2013-11-112-4/+12
* Sync with 1.8.4.3Junio C Hamano2013-11-082-1/+20
|\
| * Git 1.8.4.3v1.8.4.3Junio C Hamano2013-11-083-2/+21
| * Merge branch 'jn/test-prereq-perl-doc' into maintJunio C Hamano2013-11-081-4/+11
| |\
| * \ Merge branch 'ap/remote-hg-unquote-cquote' into maintJunio C Hamano2013-11-081-0/+6
| |\ \
| * \ \ Merge branch 'jc/upload-pack-send-symref' into maintJunio C Hamano2013-11-086-20/+124
| |\ \ \
| * \ \ \ Merge branch 'jk/http-auth-redirects' into maintJunio C Hamano2013-11-087-65/+191
| |\ \ \ \
* | \ \ \ \ Sync with maintJunio C Hamano2013-11-072-3/+39
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Start preparing for 1.8.4.3Junio C Hamano2013-11-072-1/+37
| * | | | | Merge branch 'sc/doc-howto-dumb-http' into maintJunio C Hamano2013-11-071-0/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'vd/doc-unpack-objects' into maintJunio C Hamano2013-11-071-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/subtree-install-fix' into maintJunio C Hamano2013-11-071-1/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'hn/log-graph-color-octopus' into maintJunio C Hamano2013-11-071-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mm/checkout-auto-track-fix' into maintJunio C Hamano2013-11-073-28/+98
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sg/prompt-svn-remote-fix' into maintJunio C Hamano2013-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/split-broken-ident' into maintJunio C Hamano2013-11-072-3/+22
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano2013-11-072-22/+45
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitignore.txt: fix documentation of "**" patternsKarsten Blees2013-11-071-3/+3
* | | | | | | | | | | | | | 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