| Commit message (Expand) | Author | Age |
* | merge-tree: drop generate_common strategy | Jeff King | 2016-02-22 |
* | merge-one-file: use empty blob for add/add base | Jeff King | 2016-02-22 |
* | Git 2.4.10v2.4.10 | Junio C Hamano | 2015-09-28 |
* | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 |
|\ |
|
| * | Git 2.3.10v2.3.10 | Junio C Hamano | 2015-09-28 |
| * | Merge branch 'jk/xdiff-memory-limits' into maint-2.3 | Junio C Hamano | 2015-09-28 |
| |\ |
|
| | * | merge-file: enforce MAX_XDIFF_SIZE on incoming files | Jeff King | 2015-09-28 |
| | * | xdiff: reject files larger than ~1GB | Jeff King | 2015-09-28 |
| | * | react to errors in xdi_diff | Jeff King | 2015-09-28 |
| * | | Merge branch 'jk/transfer-limit-redirection' into maint-2.3 | Junio C Hamano | 2015-09-28 |
| |\ \ |
|
| | * | | http: limit redirection depth | Blake Burkhart | 2015-09-25 |
| | * | | http: limit redirection to protocol-whitelist | Blake Burkhart | 2015-09-25 |
| | * | | transport: refactor protocol whitelist code | Jeff King | 2015-09-25 |
| * | | | Merge branch 'jk/transfer-limit-protocol' into maint-2.3 | Junio C Hamano | 2015-09-28 |
| |\ \ \
| | |/ /
| | | /
| | |/
| |/| |
|
| | * | submodule: allow only certain protocols for submodule fetches | Jeff King | 2015-09-23 |
| | * | transport: add a protocol-whitelist environment variable | Jeff King | 2015-09-23 |
| |/ |
|
* | | Git 2.4.9v2.4.9 | Junio C Hamano | 2015-09-04 |
* | | Sync with 2.3.9 | Junio C Hamano | 2015-09-04 |
|\ \
| |/ |
|
| * | Git 2.3.9v2.3.9 | Junio C Hamano | 2015-09-04 |
| * | Sync with 2.2.3 | Junio C Hamano | 2015-09-04 |
| |\ |
|
| | * | Git 2.2.3v2.2.3 | Junio C Hamano | 2015-09-04 |
| | * | Merge branch 'jk/long-paths' into maint-2.2 | Junio C Hamano | 2015-09-04 |
| | |\ |
|
| | | * | show-branch: use a strbuf for reflog descriptions | Jeff King | 2015-09-04 |
| | | * | read_info_alternates: handle paths larger than PATH_MAX | Jeff King | 2015-09-04 |
| | | * | notes: use a strbuf in add_non_note | Jeff King | 2015-09-04 |
| | | * | verify_absent: allow filenames longer than PATH_MAX | Jeff King | 2015-09-04 |
| | |/ |
|
* | | | Git 2.4.8v2.4.8 | Junio C Hamano | 2015-08-03 |
* | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint | Junio C Hamano | 2015-08-03 |
|\ \ \ |
|
| * | | | rebase -i: do not leave a CHERRY_PICK_HEAD file behind | Johannes Schindelin | 2015-06-29 |
| * | | | t3404: demonstrate CHERRY_PICK_HEAD bug | Johannes Schindelin | 2015-06-29 |
| | |/
| |/| |
|
* | | | Merge branch 'ss/clone-guess-dir-name-simplify' into maint | Junio C Hamano | 2015-08-03 |
|\ \ \ |
|
| * | | | clone: simplify string handling in guess_dir_name() | Sebastian Schuberth | 2015-07-09 |
* | | | | Merge branch 'sg/completion-commit-cleanup' into maint | Junio C Hamano | 2015-08-03 |
|\ \ \ \ |
|
| * | | | | completion: teach 'scissors' mode to 'git commit --cleanup=' | SZEDER Gábor | 2015-06-08 |
* | | | | | Merge branch 'pt/am-abort-fix' into maint | Junio C Hamano | 2015-08-03 |
|\ \ \ \ \ |
|
| * | | | | | am --abort: keep unrelated commits on unborn branch | Paul Tan | 2015-06-08 |
| * | | | | | am --abort: support aborting to unborn branch | Paul Tan | 2015-06-08 |
| * | | | | | am --abort: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 |
| * | | | | | am --skip: support skipping while on unborn branch | Paul Tan | 2015-06-08 |
| * | | | | | am -3: support 3way merge on unborn branch | Paul Tan | 2015-06-08 |
| * | | | | | am --skip: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 |
| | |_|/ /
| |/| | | |
|
* | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 |
|\ \ \ \ \ |
|
| * | | | | | read_loose_refs(): treat NULL_SHA1 loose references as broken | Michael Haggerty | 2015-06-08 |
| * | | | | | read_loose_refs(): simplify function logic | Michael Haggerty | 2015-06-03 |
| * | | | | | for-each-ref: report broken references correctly | Michael Haggerty | 2015-06-02 |
| * | | | | | t6301: new tests of for-each-ref error handling | Michael Haggerty | 2015-06-02 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'sg/commit-cleanup-scissors' into maint | Junio C Hamano | 2015-08-03 |
|\ \ \ \ \ |
|
| * | | | | | commit: cope with scissors lines in commit message | SZEDER Gábor | 2015-06-09 |
| | |_|/ /
| |/| | | |
|
* | | | | | Git 2.4.7v2.4.7 | Junio C Hamano | 2015-07-27 |
* | | | | | Merge branch 'jk/pretty-encoding-doc' into maint | Junio C Hamano | 2015-07-27 |
|\ \ \ \ \ |
|