summaryrefslogtreecommitdiffstats
path: root/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/checkout-noisy'Junio C Hamano2019-01-141-1/+2
|\
| * checkout: print something when checking out pathsNguyễn Thái Ngọc Duy2018-11-141-1/+2
* | Merge branch 'js/apply-recount-allow-noop'Junio C Hamano2018-11-181-1/+1
|\ \
| * | apply --recount: allow "no-op hunks"Johannes Schindelin2018-11-131-1/+1
* | | assert NOARG/NONEG behavior of parse-options callbacksJeff King2018-11-061-0/+18
* | | apply: return -1 from option callback instead of calling exit(1)Jeff King2018-11-061-1/+1
* | | apply: mark include/exclude options as NONEGJeff King2018-11-061-2/+2
| |/ |/|
* | Merge branch 'bc/hash-transition-part-15'Junio C Hamano2018-10-301-24/+26
|\ \
| * | apply: rename new_sha1_prefix and old_sha1_prefixbrian m. carlson2018-10-151-20/+20
| * | apply: replace hard-coded constantsbrian m. carlson2018-10-151-8/+10
| |/
* | ws.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+5
* | rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
* | ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+6
|/
* apply.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-21/+25
* apply.c: make init_apply_state() take a struct repositoryNguyễn Thái Ngọc Duy2018-08-131-0/+2
* apply.c: pass struct apply_state to more functionsNguyễn Thái Ngọc Duy2018-08-131-7/+11
* convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-1/+1
* Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano2018-08-021-13/+11
|\
| * block alloc: add lifecycle APIs for cache_entry structsJameson Miller2018-07-031-13/+11
| * read-cache: teach make_cache_entry to take object_idJameson Miller2018-07-031-1/+1
* | Merge branch 'en/apply-comment-fix'Junio C Hamano2018-07-241-1/+1
|\ \
| * | apply: fix grammar error in commentElijah Newren2018-06-281-1/+1
* | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-0/+1
|\ \ \ | |/ / |/| |
| * | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | Merge branch 'nd/diff-apply-ita'Junio C Hamano2018-06-251-7/+12
|\ \ \ | |_|/ |/| |
| * | apply: add --intent-to-addNguyễn Thái Ngọc Duy2018-05-291-7/+12
| |/
* | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-2/+2
|\ \
| * | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-2/+2
| |/
* | Merge branch 'ma/lockfile-cleanup'Junio C Hamano2018-05-301-1/+1
|\ \
| * | lock_file: make function-local locks non-staticMartin Ågren2018-05-101-1/+1
* | | Sync with Git 2.17.1Junio C Hamano2018-05-291-2/+2
|\ \ \ | |_|/ |/| |
| * | Sync with Git 2.16.4Junio C Hamano2018-05-221-2/+2
| |\ \ | | |/ | |/|
| | * Sync with Git 2.15.2Junio C Hamano2018-05-221-2/+2
| | |\
| | | * Sync with Git 2.14.4Junio C Hamano2018-05-221-2/+2
| | | |\
| | | | * Sync with Git 2.13.7Junio C Hamano2018-05-221-2/+2
| | | | |\
| | | | | * verify_path: disallow symlinks in .gitmodulesJeff King2018-05-211-2/+2
| | | | | * Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano2017-07-311-4/+2
| | | | | |\
| | | | | * \ Merge branch 'rs/apply-validate-input' into maintJunio C Hamano2017-07-101-6/+29
| | | | | |\ \
| | | | | * \ \ Merge branch 'jc/apply-fix-mismerge' into maintJunio C Hamano2017-06-041-169/+169
| | | | | |\ \ \
| | | * | | \ \ \ Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano2017-12-061-0/+2
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano2017-11-271-39/+20
| | | |\ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ Merge branch 'bc/object-id'Junio C Hamano2018-04-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-2/+2
* | | | | | | | | | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-141-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | completion: use __gitcomp_builtin in _git_applyNguyễn Thái Ngọc Duy2018-02-091-2/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-61/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: rename 'new' variablesBrandon Williams2018-02-221-27/+27
| * | | | | | | | | | apply: rename 'try' variablesBrandon Williams2018-02-221-34/+34
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'tk/apply-dev-null-verify-name-fix'Junio C Hamano2018-02-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: handle Subversion diffs with /dev/null gracefullyTatyana Krasnukha2018-02-151-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 02:36:14 +0000