aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* contrib/subtree: Add tests for subtree addTechlive Zheng2015-11-13
* contrib/subtree: Add test for missing subtreeTechlive Zheng2015-11-13
* contrib/subtree: Clean and refactor test codeTechlive Zheng2015-11-13
* Eleventh batch for 2.7Junio C Hamano2015-11-05
* Merge branch 'ea/checkout-progress'Junio C Hamano2015-11-05
|\
| * checkout: add --progress optionEdmundo Carmona Antoranz2015-11-01
* | Merge branch 'dt/http-range'Junio C Hamano2015-11-05
|\ \
| * | http: use off_t to store partial file sizeJeff King2015-11-02
| * | http.c: use CURLOPT_RANGE for range requestsDavid Turner2015-11-02
* | | Sync with 2.6.3Junio C Hamano2015-11-05
|\ \ \
| * | | Git 2.6.3v2.6.3Junio C Hamano2015-11-05
| * | | Merge branch 'rs/daemon-plug-child-leak' into maintJunio C Hamano2015-11-05
| |\ \ \
| * \ \ \ Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-05
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maintJunio C Hamano2015-11-05
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-05
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-05
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-05
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/imap-send-curl-compilation-fix' into maintJunio C Hamano2015-11-05
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rp/link-curl-before-ssl' into maintJunio C Hamano2015-11-05
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-05
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sa/send-email-smtp-batch-data-limit' into maintJunio C Hamano2015-11-05
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2015-11-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'xf/user-manual-ff' into maintJunio C Hamano2015-11-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'xf/user-manual-markup' into maintJunio C Hamano2015-11-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/everyday-markup' into maintJunio C Hamano2015-11-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/em-dash-in-doc' into maintJunio C Hamano2015-11-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/worktree-add' into maintJunio C Hamano2015-11-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/name-hash-dir-entry-fix' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tenth batch for 2.7Junio C Hamano2015-11-03
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/daemon-plug-child-leak'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daemon: plug memory leakRené Scharfe2015-11-02
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run-command: factor out child_process_clear()René Scharfe2015-11-02
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: allow blame --reverse --first-parent when it makes senseMax Kirillov2015-10-30
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: extract find_single_finalMax Kirillov2015-10-30