Commit Graph

284 Commits (master)

Author SHA1 Message Date
Junio C Hamano afe8a9070b tree-wide: apply equals-null.cocci 5 months ago
Ævar Arnfjörð Bjarmason 4998e93fa6 range-diff: plug memory leak in common invocation 7 months ago
Ævar Arnfjörð Bjarmason 44439c1c58 object-file API: have hash_object_file() take "enum object_type" 7 months ago
Ævar Arnfjörð Bjarmason c80d226a04 object-file API: have write_object_file() take "enum object_type" 7 months ago
Elijah Newren 35f6967161 ll-merge: make callers responsible for showing warnings 8 months ago
René Scharfe 4e9a325253 apply: use strsets to track symlinks 9 months ago
Jean-Noël Avila 59bb00090e i18n: factorize "--foo outside a repository" 9 months ago
Jean-Noël Avila 12909b6b8a i18n: turn "options are incompatible" into "cannot be used together" 9 months ago
Jerry Zhang 34d607032c git-apply: skip threeway in add / rename cases 9 months ago
Jerry Zhang 324eb77ee7 git-apply: add --allow-empty flag 10 months ago
Jerry Zhang c21b8ae857 git-apply: add --quiet flag 10 months ago
Junio C Hamano 57f183b698 apply: resolve trivial merge without hitting ll-merge with "--3way" 1 year ago
Jeff King 46d723ce57 apply: keep buffer/size pair in sync when parsing binary hunks 1 year ago
Ævar Arnfjörð Bjarmason bc40dfb10a string-list.h users: change to use *_{nodup,dup}() 1 year ago
Jerry Zhang 526705fd3d apply: adjust messages to account for --3way changes 1 year ago
Jerry Zhang c0c2a37ac2 git-apply: allow simultaneous --cached and --3way options 1 year ago
Jerry Zhang 923cd87ac8 git-apply: try threeway first when "--3way" is used 1 year ago
Matheus Tavares d052cc0382 entry: extract a header file for entry.c functions 2 years ago
René Scharfe ca56dadb4b use CALLOC_ARRAY 2 years ago
Ævar Arnfjörð Bjarmason 56f56ac50b style: do not "break" in switch() after "return" 2 years ago
Matheus Tavares eb3c027e17 apply: don't use core.sharedRepository to create working tree files 2 years ago
Jonathan Tan b0f266de11 apply: when -R, also reverse list of sections 2 years ago
Jeff King 9a53219f69 config: drop git_config_get_string_const() 2 years ago
Raymond E. Pasco e3cc41b4f9 apply: make i-t-a entries never match worktree 2 years ago
Raymond E. Pasco 7cfde3fa0f apply: allow "new file" patches on i-t-a entries 2 years ago
Jonathan Tan 3318238db9 apply: do not lazy fetch when applying binary 2 years ago
Denton Liu 203c85339f Use OPT_CALLBACK and OPT_CALLBACK_F 2 years ago
brian m. carlson ab90ecae99 convert: permit passing additional metadata to filter processes 3 years ago
Matheus Tavares 2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file() 3 years ago
Johannes Schindelin b4bbbbd5a2 apply --allow-overlap: fix a corner case 3 years ago
Jeff King 3eae30e464 doc: replace public-inbox links with lore.kernel.org 3 years ago
Elijah Newren 15beaaa3d1 Fix spelling errors in code comments 3 years ago
Denton Liu 091489d068 apply: respect merge.conflictStyle in --3way 3 years ago
Thomas Gummerer 2b6a9b13ca range-diff: don't segfault with mode-only changes 3 years ago
brian m. carlson 2c65d90f75 am: reload .gitattributes after patching it 3 years ago
Thomas Gummerer ef283b3699 apply: make parse_git_diff_header public 3 years ago
Thomas Gummerer 80e1841232 apply: only pass required data to gitdiff_* functions 3 years ago
Thomas Gummerer 877a833b51 apply: only pass required data to find_name_* 3 years ago
Thomas Gummerer 570fe9911b apply: only pass required data to check_header_line 3 years ago
Thomas Gummerer 85c3713df5 apply: only pass required data to git_header_name 3 years ago
Thomas Gummerer d6c88c4fdc apply: only pass required data to skip_tree_prefix 3 years ago
Thomas Gummerer 5af40877a4 apply: replace marc.info link with public-inbox 3 years ago
Johannes Schindelin d4c0a3ac78 fill_stat_cache_info(): prepare for an fsmonitor fix 3 years ago
Nguyễn Thái Ngọc Duy 5a59a2301f completion: add more parameter value completion 4 years ago
Jeff King 74f8a9c954 apply: drop unused "def" parameter from find_name_gnu() 4 years ago
Nguyễn Thái Ngọc Duy e1ff0a32e4 read-cache.c: kill read_index() 4 years ago
Nguyễn Thái Ngọc Duy 3a95f31d1c repository.c: replace hold_locked_index() with repo_hold_locked_index() 4 years ago
Jeff King 98374a07c9 convert has_sha1_file() callers to has_object_file() 4 years ago
Nguyễn Thái Ngọc Duy 0f086e6dca checkout: print something when checking out paths 4 years ago
Johannes Schindelin 22cb3835b9 apply --recount: allow "no-op hunks" 4 years ago