summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* pkt-line: rename packet_write() to packet_write_fmt()Lars Schneider2016-10-174-8/+8
* 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
* | | | | | Merge branch 'rt/help-unknown'Junio C Hamano2016-09-081-7/+23
|\ \ \ \ \ \
| * | | | | | help: introduce option --exclude-guidesRalf Thielow2016-08-301-7/+23
| * | | | | | Merge branch 'js/no-html-bypass-on-windows' into rt/help-unknownJunio C Hamano2016-08-261-7/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'cc/receive-pack-limit'Junio C Hamano2016-09-083-0/+24
|\ \ \ \ \ \ \
| * | | | | | | receive-pack: allow a maximum input size to be specifiedcc/receive-pack-limitJeff King2016-08-241-0/+12
| * | | | | | | unpack-objects: add --max-input-size=<size> optionChristian Couder2016-08-241-0/+7
| * | | | | | | index-pack: add --max-input-size=<size> optionJeff King2016-08-241-0/+5
* | | | | | | | Merge branch 'jk/format-patch-number-singleton-patch-with-cover'Junio C Hamano2016-09-081-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: show 0/1 and 1/1 for singleton patch with cover letterjk/format-patch-number-singleton-patch-with-coverJacob Keller2016-08-231-4/+4
* | | | | | | | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-08-311-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | blame: fix segfault on untracked filesmh/blame-worktreeThomas Gummerer2016-08-291-1/+2
* | | | | | | | | Merge branch 'js/no-html-bypass-on-windows'Junio C Hamano2016-08-251-7/+0
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Revert "display HTML in default browser using Windows' shell API"js/no-html-bypass-on-windowsJohannes Schindelin2016-08-191-7/+0
* | | | | | | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-191-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-151-1/+2
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano2016-08-121-0/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-102-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'os/no-verify-skips-commit-msg-too' into maintJunio C Hamano2016-08-101-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/rm-strbuf-optim' into maintJunio C Hamano2016-08-101-2/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/parse-options-concat' into maintJunio C Hamano2016-08-101-9/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano2016-08-081-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-084-21/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-081-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-08-171-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe2016-08-131-3/+1
* | | | | | | | | | | | | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase: avoid computing unnecessary patch IDsKevin Willford2016-08-111-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'js/mv-dir-to-new-directory'Junio C Hamano2016-08-121-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git mv: do not keep slash in `git mv dir non-existing-dir/`js/mv-dir-to-new-directoryJohannes Schindelin2016-08-081-4/+7
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano2016-08-121-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status