Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cocci: apply the "object-store.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -3/+6 |
* | cocci: apply the "cache.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -2/+2 |
* | Sync with Git 2.39.2 | Junio C Hamano | 2023-02-14 | 1 | -0/+27 |
|\ | |||||
| * | Sync with 2.38.4 | Johannes Schindelin | 2023-02-06 | 1 | -0/+27 |
| |\ | |||||
| | * | Sync with 2.36.5 | Johannes Schindelin | 2023-02-06 | 1 | -0/+27 |
| | |\ | |||||
| | | * | Sync with 2.35.7 | Johannes Schindelin | 2023-02-06 | 1 | -0/+27 |
| | | |\ | |||||
| | | | * | Sync with 2.34.7 | Johannes Schindelin | 2023-02-06 | 1 | -0/+27 |
| | | | |\ | |||||
| | | | | * | Sync with 2.32.6 | Johannes Schindelin | 2023-02-06 | 1 | -0/+27 |
| | | | | |\ | |||||
| | | | | | * | Sync with 2.31.7 | Johannes Schindelin | 2023-02-06 | 1 | -0/+27 |
| | | | | | |\ | |||||
| | | | | | | * | Sync with 2.30.8 | Johannes Schindelin | 2023-02-06 | 1 | -0/+27 |
| | | | | | | |\ | |||||
| | | | | | | | * | apply: fix writing behind newly created symbolic links | Patrick Steinhardt | 2023-02-03 | 1 | -0/+27 |
| | | | | * | | | | Merge branch 'jc/trivial-threeway-binary-merge' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+21 |
| | | | | |\ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge branch 'jk/apply-binary-hunk-parsing-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+1 |
| | | | | |\ \ \ \ \ | |||||
* | | | | | | | | | | | treewide: always have a valid "index_state.repo" member | Ævar Arnfjörð Bjarmason | 2023-01-17 | 1 | -1/+1 |
* | | | | | | | | | | | cache API: add a "INDEX_STATE_INIT" macro/function, add release_index() | Ævar Arnfjörð Bjarmason | 2023-01-16 | 1 | -1/+1 |
* | | | | | | | | | | | ws: drop unused parameter from ws_blank_line() | Jeff King | 2022-12-13 | 1 | -2/+2 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'tb/cap-patch-at-1gb' | Taylor Blau | 2022-10-31 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | apply: reject patches larger than ~1 GiB | Taylor Blau | 2022-10-26 | 1 | -1/+11 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | apply: mark unused parameters in noop error/warning routine | Jeff King | 2022-10-18 | 1 | -1/+1 |
* | | | | | | | | | | apply: mark unused parameters in handlers | Jeff King | 2022-10-18 | 1 | -8/+8 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'ep/maint-equals-null-cocci' | Junio C Hamano | 2022-05-21 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 | Junio C Hamano | 2022-05-02 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | tree-wide: apply equals-null.cocci | Junio C Hamano | 2022-05-02 | 1 | -3/+3 |
* | | | | | | | | | Merge branch 'ab/object-file-api-updates' | Junio C Hamano | 2022-03-17 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | object-file API: have hash_object_file() take "enum object_type" | Ævar Arnfjörð Bjarmason | 2022-02-26 | 1 | -2/+2 |
| * | | | | | | | | | object-file API: have write_object_file() take "enum object_type" | Ævar Arnfjörð Bjarmason | 2022-02-26 | 1 | -4/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | range-diff: plug memory leak in common invocation | Ævar Arnfjörð Bjarmason | 2022-03-04 | 1 | -1/+6 |
* | | | | | | | | | Merge branch 'en/remerge-diff' | Junio C Hamano | 2022-02-17 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ll-merge: make callers responsible for showing warnings | Elijah Newren | 2022-02-02 | 1 | -1/+4 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs/apply-symlinks-use-strset' | Junio C Hamano | 2022-02-05 | 1 | -34/+8 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | apply: use strsets to track symlinks | René Scharfe | 2022-01-07 | 1 | -34/+8 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ja/i18n-similar-messages' | Junio C Hamano | 2022-01-10 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n: factorize "--foo outside a repository" | Jean-Noël Avila | 2022-01-05 | 1 | -3/+3 |
| * | | | | | | | | i18n: turn "options are incompatible" into "cannot be used together" | Jean-Noël Avila | 2022-01-05 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jz/apply-3-corner-cases' | Junio C Hamano | 2022-01-10 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | git-apply: skip threeway in add / rename cases | Jerry Zhang | 2021-12-20 | 1 | -1/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | git-apply: add --allow-empty flag | Jerry Zhang | 2021-12-13 | 1 | -2/+6 |
* | | | | | | | | git-apply: add --quiet flag | Jerry Zhang | 2021-12-13 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'jc/trivial-threeway-binary-merge' | Junio C Hamano | 2021-09-15 | 1 | -0/+21 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | apply: resolve trivial merge without hitting ll-merge with "--3way" | Junio C Hamano | 2021-09-06 | 1 | -0/+21 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/apply-binary-hunk-parsing-fix' | Junio C Hamano | 2021-08-31 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | apply: keep buffer/size pair in sync when parsing binary hunks | Jeff King | 2021-08-10 | 1 | -0/+1 |
* | | | | | string-list.h users: change to use *_{nodup,dup}() | Ævar Arnfjörð Bjarmason | 2021-07-01 | 1 | -3/+3 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'jz/apply-3way-first-message-fix' | Junio C Hamano | 2021-05-07 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | apply: adjust messages to account for --3way changes | Jerry Zhang | 2021-04-29 | 1 | -1/+5 |
* | | | | | git-apply: allow simultaneous --cached and --3way options | Jerry Zhang | 2021-04-08 | 1 | -3/+6 |
|/ / / / | |||||
* | | | | git-apply: try threeway first when "--3way" is used | Jerry Zhang | 2021-04-07 | 1 | -7/+6 |
* | | | | Merge branch 'mt/parallel-checkout-part-1' | Junio C Hamano | 2021-04-02 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | entry: extract a header file for entry.c functions | Matheus Tavares | 2021-03-23 | 1 | -0/+1 |
| | |/ | |/| | |||||
* / | | use CALLOC_ARRAY | René Scharfe | 2021-03-14 | 1 | -3/+3 |
|/ / |