summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/commit-v-strip-marker'Junio C Hamano2013-12-174-9/+58
|\
| * commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-markerJens Lehmann2013-12-054-9/+58
* | Merge branch 'tr/send-email-ssl'Junio C Hamano2013-12-171-2/+6
|\ \
| * | send-email: set SSL options through IO::Socket::SSL::set_client_defaultstr/send-email-sslThomas Rast2013-12-041-2/+5
| * | send-email: --smtp-ssl-cert-path takes an argumentThomas Rast2013-12-041-1/+1
| * | send-email: pass Debug to Net::SMTP::SSL::newThomas Rast2013-12-041-0/+1
* | | Merge branch 'nd/gettext-vsnprintf'Junio C Hamano2013-12-171-4/+15
|\ \ \
| * | | gettext.c: detect the vsnprintf bug at runtimend/gettext-vsnprintfNguyễn Thái Ngọc Duy2013-12-041-4/+15
* | | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash'Junio C Hamano2013-12-172-7/+45
|\ \ \ \
| * | | | mv: let 'git mv file no-such-dir/' error outMatthieu Moy2013-12-042-7/+45
| |/ / /
* | | | Merge branch 'nd/remove-opt-boolean'Junio C Hamano2013-12-171-7/+4
|\ \ \ \
| * | | | parse-options: remove OPT_BOOLEANnd/remove-opt-booleanNguyễn Thái Ngọc Duy2013-12-091-7/+4
* | | | | Merge branch 'bc/doc-merge-no-op-revert'Junio C Hamano2013-12-171-0/+8
|\ \ \ \ \
| * | | | | Documentation: document pitfalls with 3-way mergebc/doc-merge-no-op-revertbrian m. carlson2013-12-091-0/+8
| | |_|/ / | |/| | |
* | | | | Merge branch 'fc/trivial'Junio C Hamano2013-12-175-6/+12
|\ \ \ \ \
| * | | | | remote: fix status with branch...rebase=preservefc/trivialFelipe Contreras2013-12-091-2/+7
| * | | | | fetch: add missing documentationFelipe Contreras2013-12-091-0/+3
| * | | | | t: trivial whitespace cleanupsFelipe Contreras2013-12-092-3/+1
| * | | | | abspath: trivial style fixFelipe Contreras2013-12-091-1/+1
* | | | | | Merge branch 'jk/t5000-gzip-simplify'Junio C Hamano2013-12-171-16/+4
|\ \ \ \ \ \
| * | | | | | t5000: simplify gzip prerequisite checksjk/t5000-gzip-simplifyJeff King2013-12-041-16/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'kb/doc-exclude-directory-semantics'Junio C Hamano2013-12-171-2/+17
|\ \ \ \ \ \
| * | | | | | gitignore.txt: clarify recursive nature of excluded directorieskb/doc-exclude-directory-semanticsKarsten Blees2013-12-091-2/+17
* | | | | | | Update draft release notes to 1.9Junio C Hamano2013-12-121-1/+17
* | | | | | | Merge branch 'jn/scripts-updates'Junio C Hamano2013-12-1253-600/+87
|\ \ \ \ \ \ \
| * | | | | | | remove #!interpreter line from shell librariesjn/scripts-updatesJonathan Nieder2013-11-2610-28/+19
| * | | | | | | test: replace shebangs with descriptions in shell librariesJonathan Nieder2013-11-2615-20/+64
| * | | | | | | test: make FILEMODE a lazy prereqJonathan Nieder2013-11-268-17/+4
| * | | | | | | contrib: remove git-p4importJonathan Nieder2013-11-263-533/+0
| * | | | | | | mark contributed hooks executableJonathan Nieder2013-11-254-2/+0
| * | | | | | | mark perl test scripts executableJonathan Nieder2013-11-2510-0/+0
| * | | | | | | mark Windows build scripts executableJonathan Nieder2013-11-255-0/+0
* | | | | | | | Merge branch 'cn/thin-push-capability'Junio C Hamano2013-12-122-8/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | send-pack: don't send a thin pack to a server which doesn't support itcn/thin-push-capabilityCarlos Martín Nieto2013-11-252-8/+25
* | | | | | | | | Merge branch 'jk/remove-deprecated'Junio C Hamano2013-12-1218-411/+48
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Sync with 1.8.5jk/remove-deprecatedJunio C Hamano2013-12-0528-7537/+9220
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | stop installing git-tar-tree linkJonathan Nieder2013-12-032-2/+1
| * | | | | | | | | peek-remote: remove deprecated alias of ls-remoteJohn Keeping2013-11-126-48/+0
| * | | | | | | | | lost-found: remove deprecated commandJohn Keeping2013-11-126-111/+0
| * | | | | | | | | tar-tree: remove deprecated commandJohn Keeping2013-11-129-173/+5
| * | | | | | | | | repo-config: remove deprecated alias for "git config"John Keeping2013-11-129-37/+2
* | | | | | | | | | Merge branch 'tr/commit-slab-cleanup'Junio C Hamano2013-12-121-8/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit-slab: sizeof() the right type in xrealloctr/commit-slab-cleanupThomas Rast2013-12-021-1/+1
| * | | | | | | | | | commit-slab: declare functions "static inline"Thomas Rast2013-11-271-6/+20
| * | | | | | | | | | commit-slab: document clear_$slabname()Thomas Rast2013-11-271-1/+10
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/doc-submitting-patches'Junio C Hamano2013-12-121-2/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SubmittingPatches: document how to handle multiple patchesrs/doc-submitting-patchesRené Scharfe2013-11-271-2/+9
* | | | | | | | | | | Merge branch 'tr/doc-git-cherry'Junio C Hamano2013-12-121-33/+110
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: revamp git-cherry(1)tr/doc-git-cherryThomas Rast2013-11-271-33/+110
* | | | | | | | | | | | Merge branch 'cl/p4-use-diff-tree'Junio C Hamano2013-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \