Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ls/p4-translation-failure' | Junio C Hamano | 2015-10-16 | 2 | -11/+66 |
|\ | |||||
| * | git-p4: handle "Translation of file content failed" | Lars Schneider | 2015-09-22 | 2 | -12/+17 |
| * | git-p4: add test case for "Translation of file content failed" error | Lars Schneider | 2015-09-22 | 1 | -0/+50 |
* | | Merge branch 'nd/gc-auto-background-fix' | Junio C Hamano | 2015-10-16 | 1 | -1/+55 |
|\ \ | |||||
| * | | gc: save log from daemonized gc --auto and print it next time | Nguyễn Thái Ngọc Duy | 2015-09-21 | 1 | -1/+55 |
* | | | Merge branch 'mk/submodule-gitdir-path' | Junio C Hamano | 2015-10-16 | 5 | -17/+41 |
|\ \ \ | |||||
| * | | | path: implement common_dir handling in git_pathdup_submodule() | Max Kirillov | 2015-09-14 | 4 | -9/+41 |
| * | | | submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() | Max Kirillov | 2015-09-14 | 1 | -8/+1 |
* | | | | Third batch for 2.7 | Junio C Hamano | 2015-10-14 | 1 | -0/+8 |
* | | | | Merge branch 'pt/pull-builtin' | Junio C Hamano | 2015-10-14 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | merge: grammofix in please-commit-before-merge message | Alex Henrie | 2015-10-02 | 2 | -2/+2 |
* | | | | | Merge branch 'nd/ls-remote-does-not-have-u-option' | Junio C Hamano | 2015-10-14 | 2 | -3/+2 |
|\ \ \ \ \ | |||||
| * | | | | | ls-remote.txt: delete unsupported option | Nguyễn Thái Ngọc Duy | 2015-09-28 | 2 | -3/+2 |
* | | | | | | Merge branch 'jk/asciidoctor-section-heading-markup-fix' | Junio C Hamano | 2015-10-14 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: fix section header mark-up | John Keeping | 2015-09-25 | 2 | -2/+2 |
* | | | | | | | Merge branch 'tk/typofix-connect-unknown-proto-error' | Junio C Hamano | 2015-10-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | connect: fix typo in result string of prot_name() | Tobias Klauser | 2015-09-25 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jk/notes-dwim-doc' | Junio C Hamano | 2015-10-14 | 3 | -3/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | notes: correct documentation of DWIMery for notes references | Jacob Keller | 2015-09-23 | 3 | -3/+12 |
* | | | | | | | | | git-multimail: update to release 1.2.0 | Matthieu Moy | 2015-10-12 | 9 | -226/+1218 |
* | | | | | | | | | Second batch for 2.7 | Junio C Hamano | 2015-10-07 | 1 | -0/+16 |
* | | | | | | | | | Merge branch 'ls/p4-path-encoding' | Junio C Hamano | 2015-10-07 | 3 | -0/+75 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-p4: use replacement character for non UTF-8 characters in paths | Lars Schneider | 2015-09-21 | 1 | -1/+1 |
| * | | | | | | | | | git-p4: improve path encoding verbose output | Lars Schneider | 2015-09-17 | 1 | -10/+9 |
| * | | | | | | | | | git-p4: add config git-p4.pathEncoding | Lars Schneider | 2015-09-03 | 3 | -0/+76 |
* | | | | | | | | | | Merge branch 'gb/filter-branch-progress' | Junio C Hamano | 2015-10-07 | 1 | -1/+31 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | filter-branch: make report-progress more readable | Junio C Hamano | 2015-09-22 | 1 | -7/+9 |
| * | | | | | | | | | | filter-branch: add passed/remaining seconds on progress | Gabor Bernat | 2015-09-22 | 1 | -1/+29 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'nd/ignore-then-not-ignore' | Junio C Hamano | 2015-10-07 | 3 | -10/+127 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | dir.c: don't exclude whole dir prematurely if neg pattern may match | Nguyễn Thái Ngọc Duy | 2015-09-21 | 3 | -5/+117 |
| * | | | | | | | | | | dir.c: make last_exclude_matching_from_list() run til the end | Nguyễn Thái Ngọc Duy | 2015-09-21 | 1 | -5/+10 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' | Junio C Hamano | 2015-10-07 | 3 | -14/+34 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pager: don't use unsafe functions in signal handlers | Takashi Iwai | 2015-09-04 | 3 | -14/+34 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Start cycle toward 2.7 | Junio C Hamano | 2015-10-05 | 3 | -2/+111 |
* | | | | | | | | | | Sync with 2.6.1 | Junio C Hamano | 2015-10-05 | 31 | -32/+508 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Git 2.6.1v2.6.1 | Junio C Hamano | 2015-09-29 | 4 | -3/+22 |
| * | | | | | | | | | | Sync with v2.5.4 | Junio C Hamano | 2015-09-29 | 29 | -30/+486 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Git 2.5.4v2.5.4 | Junio C Hamano | 2015-09-29 | 4 | -3/+22 |
| | * | | | | | | | | | | Sync with 2.4.10 | Junio C Hamano | 2015-09-29 | 28 | -29/+466 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Git 2.4.10v2.4.10 | Junio C Hamano | 2015-09-29 | 4 | -3/+22 |
| | | * | | | | | | | | | Sync with 2.3.10 | Junio C Hamano | 2015-09-29 | 27 | -28/+446 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Git 2.3.10v2.3.10 | Junio C Hamano | 2015-09-29 | 4 | -3/+22 |
| | | | * | | | | | | | | Merge branch 'jk/xdiff-memory-limits' into maint-2.3 | Junio C Hamano | 2015-09-28 | 11 | -26/+57 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | merge-file: enforce MAX_XDIFF_SIZE on incoming files | Jeff King | 2015-09-28 | 1 | -1/+2 |
| | | | | * | | | | | | | | xdiff: reject files larger than ~1GB | Jeff King | 2015-09-28 | 3 | -1/+14 |
| | | | | * | | | | | | | | react to errors in xdi_diff | Jeff King | 2015-09-28 | 7 | -24/+41 |
| | | | | | |/ / / / / / | | | | | |/| | | | | | | |||||
| | | | * | | | | | | | | Merge branch 'jk/transfer-limit-redirection' into maint-2.3 | Junio C Hamano | 2015-09-28 | 6 | -15/+78 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | http: limit redirection depth | Blake Burkhart | 2015-09-26 | 3 | -0/+8 |
| | | | | * | | | | | | | | http: limit redirection to protocol-whitelist | Blake Burkhart | 2015-09-26 | 4 | -5/+27 |
| | | | | * | | | | | | | | transport: refactor protocol whitelist code | Jeff King | 2015-09-26 | 2 | -10/+43 |