summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | builtin/apply: make try_create_file() return -1 on errorChristian Couder2016-09-071-11/+33
| * | | | | | | | | | | | | builtin/apply: make write_out_results() return -1 on errorChristian Couder2016-08-111-6/+21
| * | | | | | | | | | | | | builtin/apply: make write_out_one_result() return -1 on errorChristian Couder2016-08-111-22/+16
| * | | | | | | | | | | | | builtin/apply: make create_file() return -1 on errorChristian Couder2016-08-111-12/+13
| * | | | | | | | | | | | | builtin/apply: make add_index_file() return -1 on errorChristian Couder2016-08-111-17/+31
| * | | | | | | | | | | | | builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder2016-08-111-7/+13
| * | | | | | | | | | | | | builtin/apply: make remove_file() return -1 on errorChristian Couder2016-08-111-6/+11
| * | | | | | | | | | | | | builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder2016-08-111-15/+26
| * | | | | | | | | | | | | builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder2016-08-111-11/+21
| * | | | | | | | | | | | | builtin/apply: make gitdiff_*() return -1 on errorChristian Couder2016-08-111-19/+21
| * | | | | | | | | | | | | builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder2016-08-111-3/+9
| * | | | | | | | | | | | | builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder2016-08-111-6/+9
| * | | | | | | | | | | | | builtin/apply: make apply_all_patches() return 128 or 1 on errorChristian Couder2016-08-111-11/+26
| * | | | | | | | | | | | | builtin/apply: move check_apply_state() to apply.cChristian Couder2016-08-111-32/+0
| * | | | | | | | | | | | | builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder2016-08-111-8/+11
| * | | | | | | | | | | | | apply: make init_apply_state() return -1 instead of exit()ingChristian Couder2016-08-111-1/+2
| * | | | | | | | | | | | | builtin/apply: move init_apply_state() to apply.cChristian Couder2016-08-111-91/+0
| * | | | | | | | | | | | | builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die(...Christian Couder2016-08-111-7/+7
| * | | | | | | | | | | | | builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder2016-08-111-11/+12
| * | | | | | | | | | | | | builtin/apply: make parse_single_patch() return -1 on errorChristian Couder2016-08-111-4/+13
| * | | | | | | | | | | | | builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder2016-08-111-8/+14
| * | | | | | | | | | | | | builtin/apply: make find_header() return -128 instead of die()ingChristian Couder2016-08-111-12/+28
| * | | | | | | | | | | | | builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder2016-08-111-3/+5
| * | | | | | | | | | | | | builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder2016-08-111-15/+45
| * | | | | | | | | | | | | apply: move 'struct apply_state' to apply.hChristian Couder2016-08-111-97/+1
| * | | | | | | | | | | | | apply: make some names more specificChristian Couder2016-08-111-10/+10
* | | | | | | | | | | | | | Merge branch 'ah/misc-message-fixes'Junio C Hamano2016-09-152-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | cat-file: put spaces around pipes in usage stringAlex Henrie2016-09-081-1/+1
| * | | | | | | | | | | | | am: put spaces around pipe in usage stringAlex Henrie2016-09-081-1/+1
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/pack-tag-of-tag'Junio C Hamano2016-09-151-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pack-objects: walk tag chains for --include-tagjk/pack-tag-of-tagJeff King2016-09-071-1/+30
* | | | | | | | | | | | | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD'Junio C Hamano2016-09-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | symbolic-ref -d: do not allow removal of HEADjc/forbid-symbolic-ref-d-HEADJunio C Hamano2016-09-021-0/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jc/am-read-author-file'Junio C Hamano2016-09-121-58/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am: refactor read_author_script()jc/am-read-author-fileJunio C Hamano2016-08-301-58/+45
* | | | | | | | | | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-09-121-41/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-311-41/+33
* | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-rr'Junio C Hamano2016-09-082-50/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | clone: recursive and reference option triggers submodule alternatessb/submodule-clone-rrStefan Beller2016-08-172-0/+121
| * | | | | | | | | | | | | | clone: implement optional referencesStefan Beller2016-08-151-10/+25
| * | | | | | | | | | | | | | clone: clarify option_reference as requiredStefan Beller2016-08-151-4/+4
| * | | | | | | | | | | | | | clone: factor out checking for an alternate pathStefan Beller2016-08-151-34/+9
| * | | | | | | | | | | | | | submodule--helper update-clone: allow multiple referencesStefan Beller2016-08-121-5/+9
| * | | | | | | | | | | | | | submodule--helper module-clone: allow multiple referencesStefan Beller2016-08-121-8/+12
* | | | | | | | | | | | | | | Merge branch 'jh/status-v2-porcelain'Junio C Hamano2016-09-081-44/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | status: print branch info with --porcelain=v2 --branchJeff Hostetler2016-08-111-0/+5
| * | | | | | | | | | | | | | | status: collect per-file data for --porcelain=v2Jeff Hostetler2016-08-111-0/+3
| * | | | | | | | | | | | | | | status: support --porcelain[=<version>]Jeff Hostetler2016-08-051-3/+18
| * | | | | | | | | | | | | | | status: cleanup API to wt_status_printJeff Hostetler2016-08-051-42/+9
| * | | | | | | | | | | | | | | status: rename long-format print routinesJeff Hostetler2016-08-051-2/+2
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |