summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-09-08Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintLibravatar Junio C Hamano10-90/+112
2016-09-08Merge branch 'jk/common-main' into maintLibravatar Junio C Hamano53-153/+126
2016-09-08diff: remove dead codeLibravatar Stefan Beller1-8/+0
2016-09-08diff: omit found pointer from emit_callbackLibravatar Stefan Beller1-4/+2
2016-09-08diff.c: use diff_options directlyLibravatar Stefan Beller1-11/+10
2016-09-08transport: report missing submodule pushes consistently on stderrLibravatar Stefan Beller1-1/+1
2016-09-08checkout: add some spaces between code and commentLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2016-09-08unpack-trees: do not capitalize "working"Libravatar Alex Henrie1-2/+2
2016-09-08git-merge-octopus: do not capitalize "octopus"Libravatar Alex Henrie1-2/+2
2016-09-08git-rebase--interactive: fix English grammarLibravatar Alex Henrie1-1/+1
2016-09-08cat-file: put spaces around pipes in usage stringLibravatar Alex Henrie1-1/+1
2016-09-08am: put spaces around pipe in usage stringLibravatar Alex Henrie1-1/+1
2016-09-08remote-curl: handle URLs without protocolLibravatar Jeff King2-1/+9
2016-09-07builtin/reset: convert to use struct object_idLibravatar brian m. carlson1-26/+26
2016-09-07builtin/commit-tree: convert to struct object_idLibravatar brian m. carlson1-10/+10
2016-09-07builtin/am: convert to struct object_idLibravatar brian m. carlson1-70/+70
2016-09-07refs: add an update_ref_oid function.Libravatar brian m. carlson2-0/+11
2016-09-07sha1_name: convert get_sha1_mb to struct object_idLibravatar brian m. carlson3-11/+11
2016-09-07builtin/update-index: convert file to struct object_idLibravatar brian m. carlson1-30/+31
2016-09-07notes: convert init_notes to use struct object_idLibravatar brian m. carlson1-6/+6
2016-09-07builtin/rm: convert to use struct object_idLibravatar brian m. carlson1-9/+9
2016-09-07builtin/blame: convert file to use struct object_idLibravatar brian m. carlson1-14/+14
2016-09-07Convert read_mmblob to take struct object_id.Libravatar brian m. carlson6-17/+18
2016-09-07notes-merge: convert struct notes_merge_pair to struct object_idLibravatar brian m. carlson1-62/+65
2016-09-07builtin/checkout: convert some static functions to struct object_idLibravatar brian m. carlson1-33/+33
2016-09-07streaming: make stream_blob_to_fd take struct object_idLibravatar brian m. carlson6-10/+10
2016-09-07builtin: convert textconv_object to use struct object_idLibravatar brian m. carlson4-9/+9
2016-09-07builtin/cat-file: convert some static functions to struct object_idLibravatar brian m. carlson1-25/+25
2016-09-07builtin/cat-file: convert struct expand_data to use struct object_idLibravatar brian m. carlson1-10/+12
2016-09-07builtin/log: convert some static functions to use struct object_idLibravatar brian m. carlson1-22/+22
2016-09-07builtin/blame: convert struct origin to use struct object_idLibravatar brian m. carlson1-20/+20
2016-09-07builtin/apply: convert static functions to struct object_idLibravatar brian m. carlson1-48/+48
2016-09-07cache: convert struct cache_entry to use struct object_idLibravatar brian m. carlson26-69/+79
2016-09-07builtin/am: use apply API in run_apply()Libravatar Christian Couder1-22/+43
2016-09-07apply: learn to use a different index fileLibravatar Christian Couder2-6/+22
2016-09-07apply: pass apply state to build_fake_ancestor()Libravatar Christian Couder1-4/+5
2016-09-07apply: refactor `git apply` option parsingLibravatar Christian Couder3-98/+97
2016-09-07apply: change error_routine when silentLibravatar Christian Couder2-1/+28
2016-09-07usage: add get_error_routine() and get_warn_routine()Libravatar Christian Couder2-0/+12
2016-09-07usage: add set_warn_routine()Libravatar Christian Couder2-0/+6
2016-09-07apply: don't print on stdout in verbosity_silent modeLibravatar Christian Couder1-3/+3
2016-09-07apply: make it possible to silently applyLibravatar Christian Couder3-24/+48
2016-09-07apply: use error_errno() where possibleLibravatar Christian Couder1-8/+8
2016-09-07apply: make some parsing functions static againLibravatar Christian Couder2-8/+3
2016-09-07apply: move libified code from builtin/apply.c to apply.{c,h}Libravatar Christian Couder3-4732/+4751
2016-09-07apply: rename and move opt constants to apply.hLibravatar Christian Couder2-7/+11
2016-09-07builtin/apply: rename option parsing functionsLibravatar Christian Couder1-20/+20
2016-09-07builtin/apply: make create_one_file() return -1 on errorLibravatar Christian Couder1-15/+21
2016-09-07builtin/apply: make try_create_file() return -1 on errorLibravatar Christian Couder1-11/+33
2016-09-07rebase -i: improve advice on bad instruction linesLibravatar Ralf Thielow2-4/+4