Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | read-cache.c: kill read_index() | Nguyễn Thái Ngọc Duy | 2019-01-14 | 1 | -1/+1 |
* | repository.c: replace hold_locked_index() with repo_hold_locked_index() | Nguyễn Thái Ngọc Duy | 2019-01-14 | 1 | -1/+2 |
* | Merge branch 'js/apply-recount-allow-noop' | Junio C Hamano | 2018-11-18 | 1 | -1/+1 |
|\ | |||||
| * | apply --recount: allow "no-op hunks" | Johannes Schindelin | 2018-11-13 | 1 | -1/+1 |
* | | assert NOARG/NONEG behavior of parse-options callbacks | Jeff King | 2018-11-06 | 1 | -0/+18 |
* | | apply: return -1 from option callback instead of calling exit(1) | Jeff King | 2018-11-06 | 1 | -1/+1 |
* | | apply: mark include/exclude options as NONEG | Jeff King | 2018-11-06 | 1 | -2/+2 |
* | | Merge branch 'bc/hash-transition-part-15' | Junio C Hamano | 2018-10-30 | 1 | -24/+26 |
|\ \ | |||||
| * | | apply: rename new_sha1_prefix and old_sha1_prefix | brian m. carlson | 2018-10-15 | 1 | -20/+20 |
| * | | apply: replace hard-coded constants | brian m. carlson | 2018-10-15 | 1 | -8/+10 |
| |/ | |||||
* | | ws.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -3/+5 |
* | | rerere.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -1/+1 |
* | | ll-merge.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -3/+6 |
|/ | |||||
* | apply.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -21/+25 |
* | apply.c: make init_apply_state() take a struct repository | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -0/+2 |
* | apply.c: pass struct apply_state to more functions | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -7/+11 |
* | convert.c: remove an implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -1/+1 |
* | Merge branch 'jm/cache-entry-from-mem-pool' | Junio C Hamano | 2018-08-02 | 1 | -13/+11 |
|\ | |||||
| * | block alloc: add lifecycle APIs for cache_entry structs | Jameson Miller | 2018-07-03 | 1 | -13/+11 |
| * | read-cache: teach make_cache_entry to take object_id | Jameson Miller | 2018-07-03 | 1 | -1/+1 |
* | | Merge branch 'en/apply-comment-fix' | Junio C Hamano | 2018-07-24 | 1 | -1/+1 |
|\ \ | |||||
| * | | apply: fix grammar error in comment | Elijah Newren | 2018-06-28 | 1 | -1/+1 |
* | | | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 2018-07-18 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | object-store: move object access functions to object-store.h | Stefan Beller | 2018-05-16 | 1 | -0/+1 |
* | | | Merge branch 'nd/diff-apply-ita' | Junio C Hamano | 2018-06-25 | 1 | -7/+12 |
|\ \ \ | |_|/ |/| | | |||||
| * | | apply: add --intent-to-add | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -7/+12 |
| |/ | |||||
* | | Merge branch 'js/use-bug-macro' | Junio C Hamano | 2018-05-30 | 1 | -2/+2 |
|\ \ | |||||
| * | | Replace all die("BUG: ...") calls by BUG() ones | Johannes Schindelin | 2018-05-06 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'ma/lockfile-cleanup' | Junio C Hamano | 2018-05-30 | 1 | -1/+1 |
|\ \ | |||||
| * | | lock_file: make function-local locks non-static | Martin Ågren | 2018-05-10 | 1 | -1/+1 |
* | | | Sync with Git 2.17.1 | Junio C Hamano | 2018-05-29 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Sync with Git 2.16.4 | Junio C Hamano | 2018-05-22 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | Sync with Git 2.15.2 | Junio C Hamano | 2018-05-22 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Sync with Git 2.14.4 | Junio C Hamano | 2018-05-22 | 1 | -2/+2 |
| | | |\ | |||||
| | | | * | Sync with Git 2.13.7 | Junio C Hamano | 2018-05-22 | 1 | -2/+2 |
| | | | |\ | |||||
| | | | | * | verify_path: disallow symlinks in .gitmodules | Jeff King | 2018-05-21 | 1 | -2/+2 |
| | | | | * | Merge branch 'rs/apply-avoid-over-reading' into maint | Junio C Hamano | 2017-07-31 | 1 | -4/+2 |
| | | | | |\ | |||||
| | | | | * \ | Merge branch 'rs/apply-validate-input' into maint | Junio C Hamano | 2017-07-10 | 1 | -6/+29 |
| | | | | |\ \ | |||||
| | | | | * \ \ | Merge branch 'jc/apply-fix-mismerge' into maint | Junio C Hamano | 2017-06-04 | 1 | -169/+169 |
| | | | | |\ \ \ | |||||
| | | * | | \ \ \ | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint | Junio C Hamano | 2017-12-06 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'rs/apply-fuzzy-match-fix' into maint | Junio C Hamano | 2017-11-27 | 1 | -39/+20 |
| | | |\ \ \ \ \ \ \ | |||||
* | | | \ \ \ \ \ \ \ | Merge branch 'bc/object-id' | Junio C Hamano | 2018-04-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | sha1_file: convert read_sha1_file to struct object_id | brian m. carlson | 2018-03-14 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'nd/parseopt-completion' | Junio C Hamano | 2018-03-14 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | completion: use __gitcomp_builtin in _git_apply | Nguyễn Thái Ngọc Duy | 2018-02-09 | 1 | -2/+3 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'bw/c-plus-plus' | Junio C Hamano | 2018-03-06 | 1 | -61/+61 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | apply: rename 'new' variables | Brandon Williams | 2018-02-22 | 1 | -27/+27 |
| * | | | | | | | | | | apply: rename 'try' variables | Brandon Williams | 2018-02-22 | 1 | -34/+34 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'tk/apply-dev-null-verify-name-fix' | Junio C Hamano | 2018-02-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | apply: handle Subversion diffs with /dev/null gracefullytk/apply-dev-null-verify-name-fix | Tatyana Krasnukha | 2018-02-15 | 1 | -1/+1 |
| | |_|_|_|/ / / / / | |/| | | | | | | | |