summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ref-filter: get rid of gotoot/ref-filter-cleanupOlga Telezhnaya2018-02-211-3/+3
* ref-filter: get rid of duplicate codeOlga Telezhnaya2018-02-211-24/+21
* Merge branch 'ot/pretty'Junio C Hamano2017-12-276-84/+136
|\
| * format: create docs for pretty.hot/prettyOlga Telezhnaya2017-12-121-0/+44
| * format: create pretty.h fileOlga Telezhnaya2017-12-126-84/+92
* | Merge branch 'bw/submodule-sans-cache-compat'Junio C Hamano2017-12-275-23/+31
|\ \
| * | submodule: convert get_next_submodule to not rely on the_indexbw/submodule-sans-cache-compatBrandon Williams2017-12-123-15/+22
| * | submodule: used correct index in is_staging_gitmodules_okBrandon Williams2017-12-122-3/+4
| * | submodule: convert stage_updated_gitmodules to take a struct index_stateBrandon Williams2017-12-124-5/+5
* | | Merge branch 'es/clone-shared-worktree'Junio C Hamano2017-12-272-1/+8
|\ \ \
| * | | clone: support 'clone --shared' from a worktreees/clone-shared-worktreeEric Sunshine2017-12-112-1/+8
* | | | Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano2017-12-271-5/+7
|\ \ \ \
| * | | | docs/pretty-formats: mention commas in %(trailers) syntaxtb/delimit-pretty-trailers-args-with-commaJeff King2017-12-081-5/+7
* | | | | Merge branch 'rs/fmt-merge-msg-leakfix'Junio C Hamano2017-12-271-2/+5
|\ \ \ \ \
| * | | | | transport-helper: plug strbuf and string_list leaksrs/fmt-merge-msg-leakfixRené Scharfe2017-12-081-2/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jt/decorate-api'Junio C Hamano2017-12-278-25/+146
|\ \ \ \ \
| * | | | | decorate: clean up and document APIjt/decorate-apiJonathan Tan2017-12-088-25/+146
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/cvsimport-quoting'Junio C Hamano2017-12-271-1/+1
|\ \ \ \ \
| * | | | | cvsimport: apply shell-quoting regex globallyjk/cvsimport-quotingJeff King2017-12-081-1/+1
* | | | | | Merge branch 'db/doc-workflows-neuter-the-maintainer'Junio C Hamano2017-12-271-2/+2
|\ \ \ \ \ \
| * | | | | | doc: reword gitworkflows.txt for neutralitydb/doc-workflows-neuter-the-maintainerDaniel Bensoussan2017-12-081-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ks/branch-cleanup'Junio C Hamano2017-12-274-11/+24
|\ \ \ \ \ \
| * | | | | | builtin/branch: strip refs/heads/ using skip_prefixks/branch-cleanupKaartic Sivaraam2017-12-071-4/+11
| * | | | | | branch: update warning message shown when copying a misnamed branchKaartic Sivaraam2017-12-071-1/+1
| * | | | | | branch: group related arguments of create_branch()Kaartic Sivaraam2017-12-074-7/+8
| * | | | | | branch: improve documentation and naming of create_branch() parametersKaartic Sivaraam2017-12-072-3/+8
* | | | | | | Merge branch 'rs/strbuf-read-once-reset-length'Junio C Hamano2017-12-271-0/+3
|\ \ \ \ \ \ \
| * | | | | | | strbuf: release memory on read error in strbuf_read_once()rs/strbuf-read-once-reset-lengthRené Scharfe2017-12-071-0/+3
* | | | | | | | Merge branch 'rs/fmt-merge-msg-string-leak-fix'Junio C Hamano2017-12-271-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fmt-merge-msg: avoid leaking strbuf in shortlog()rs/fmt-merge-msg-string-leak-fixRené Scharfe2017-12-071-1/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'rs/am-builtin-leakfix'Junio C Hamano2017-12-271-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | am: release strbuf after use in split_mail_mbox()rs/am-builtin-leakfixRené Scharfe2017-12-071-3/+7
* | | | | | | | | Merge branch 'es/worktree-checkout-hook'Junio C Hamano2017-12-273-7/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | worktree: invoke post-checkout hook (unless --no-checkout)es/worktree-checkout-hookEric Sunshine2017-12-073-7/+47
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'lb/rebase-i-short-command-names'Junio C Hamano2017-12-278-126/+186
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sequencer.c: drop 'const' from function return typelb/rebase-i-short-command-namesJunio C Hamano2017-12-271-1/+1
| * | | | | | | | | t3404: add test case for abbreviated commandsLiam Beguin2017-12-051-0/+22
| * | | | | | | | | rebase -i: learn to abbreviate command namesLiam Beguin2017-12-054-2/+38
| * | | | | | | | | rebase -i -x: add exec commands via the rebase--helperLiam Beguin2017-12-054-23/+47
| * | | | | | | | | rebase -i: update functions to use a flags parameterLiam Beguin2017-12-053-13/+17
| * | | | | | | | | rebase -i: replace reference to sha1 with oidLiam Beguin2017-12-051-5/+5
| * | | | | | | | | rebase -i: refactor transform_todo_idsLiam Beguin2017-12-053-44/+31
| * | | | | | | | | rebase -i: set commit to null in exec commandsLiam Beguin2017-12-041-0/+1
| * | | | | | | | | Documentation: use preferred name for the 'todo list' scriptLiam Beguin2017-12-041-2/+2
| * | | | | | | | | Documentation: move rebase.* configs to new fileLiam Beguin2017-12-043-48/+34
* | | | | | | | | | Merge branch 'tb/check-crlf-for-safe-crlf'Junio C Hamano2017-12-272-10/+86
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t0027: Adapt the new MIX tests to Windowstb/check-crlf-for-safe-crlfTorsten Bögershausen2017-12-081-8/+9
| * | | | | | | | | | convert: tighten the safe autocrlf handlingTorsten Bögershausen2017-11-272-10/+85
* | | | | | | | | | | Merge branch 'jh/object-filtering'Junio C Hamano2017-12-2720-53/+1735
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rev-list: support --no-filter argumentJeff Hostetler2017-12-052-5/+14
View Lorry Controller Status