summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPrs/parseopt-short-helpRené Scharfe2015-11-201-11/+1
* grep: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe2015-11-201-16/+1
* parse-options: allow -h as a short optionRené Scharfe2015-11-202-6/+11
* parse-options: inline parse_options_usage() at its only remaining callerRené Scharfe2015-11-201-12/+1
* parse-options: deduplicate parse_options_usage() callsRené Scharfe2015-11-201-6/+12
* Merge branch 'master' of git://git.bogomips.org/git-svnJeff King2015-11-201-8/+76
|\
| * git-svn: improve rebase/mkdirs performanceDair Grant2015-11-101-8/+76
* | Merge branch 'lf/ref-is-hidden-namespace'Jeff King2015-11-206-15/+100
|\ \
| * | t5509: add basic tests for hideRefslf/ref-is-hidden-namespaceLukas Fleischer2015-11-051-0/+41
| * | hideRefs: add support for matching full refsLukas Fleischer2015-11-055-16/+52
| * | upload-pack: strip refs before calling ref_is_hidden()Lukas Fleischer2015-11-051-3/+3
| * | config.txt: document the semantics of hideRefs with namespacesLukas Fleischer2015-11-051-0/+8
* | | Merge branch 'dk/gc-idx-wo-pack'Jeff King2015-11-206-22/+78
|\ \ \ | |_|/ |/| |
| * | gc: remove garbage .idx files from pack dirdk/gc-idx-wo-packDoug Kelly2015-11-042-1/+22
| * | t5304: test cleaning pack garbageDoug Kelly2015-11-041-0/+21
| * | prepare_packed_git(): refactor garbage reporting in pack directoryJunio C Hamano2015-08-174-22/+36
* | | Eleventh batch for 2.7Junio C Hamano2015-11-051-0/+10
* | | Merge branch 'ea/checkout-progress'Junio C Hamano2015-11-052-2/+18
|\ \ \
| * | | checkout: add --progress optionea/checkout-progressEdmundo Carmona Antoranz2015-11-012-2/+18
* | | | Merge branch 'dt/http-range'Junio C Hamano2015-11-052-26/+16
|\ \ \ \
| * | | | http: use off_t to store partial file sizedt/http-rangeJeff King2015-11-021-4/+4
| * | | | http.c: use CURLOPT_RANGE for range requestsDavid Turner2015-11-022-22/+12
* | | | | Sync with 2.6.3Junio C Hamano2015-11-052-1/+113
|\ \ \ \ \
| * | | | | Git 2.6.3v2.6.3Junio C Hamano2015-11-054-3/+115
| * | | | | Merge branch 'rs/daemon-plug-child-leak' into maintJunio C Hamano2015-11-054-6/+18
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-052-35/+43
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maintJunio C Hamano2015-11-051-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-055-6/+12
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-053-7/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-055-89/+144
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/imap-send-curl-compilation-fix' into maintJunio C Hamano2015-11-051-0/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rp/link-curl-before-ssl' into maintJunio C Hamano2015-11-052-6/+34
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-054-8/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sa/send-email-smtp-batch-data-limit' into maintJunio C Hamano2015-11-051-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2015-11-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'xf/user-manual-ff' into maintJunio C Hamano2015-11-041-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'xf/user-manual-markup' into maintJunio C Hamano2015-11-0411-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/everyday-markup' into maintJunio C Hamano2015-11-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/em-dash-in-doc' into maintJunio C Hamano2015-11-046-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/worktree-add' into maintJunio C Hamano2015-11-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2015-11-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-033-1/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/name-hash-dir-entry-fix' into maintJunio C Hamano2015-11-034-60/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-031-16/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-0325-41/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-032-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano2015-11-031-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano2015-11-035-17/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-031-1/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status