summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | list-objects-filter-options: support --no-filterJeff Hostetler2017-12-053-3/+20
| * | | | | | | | | list-objects-filter-options: fix 'keword' typo in commentChristian Couder2017-12-051-1/+1
| * | | | | | | | | pack-objects: add list-objects filteringJeff Hostetler2017-11-223-2/+456
| * | | | | | | | | rev-list: add list-objects filtering supportJeff Hostetler2017-11-224-3/+370
| * | | | | | | | | list-objects: filter objects in traverse_commit_listJeff Hostetler2017-11-228-17/+711
| * | | | | | | | | oidset: add iterator methods to oidsetJeff Hostetler2017-11-222-0/+46
| * | | | | | | | | oidmap: add oidmap iterator methodsJeff Hostetler2017-11-221-0/+22
| * | | | | | | | | dir: allow exclusions from blob in addition to fileJeff Hostetler2017-11-222-31/+104
* | | | | | | | | | RelNotes: the tenth batchJunio C Hamano2017-12-191-0/+46
* | | | | | | | | | Merge branch 'ls/editor-waiting-message'Junio C Hamano2017-12-197-7/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | launch_editor(): indicate that Git waits for user inputls/editor-waiting-messageLars Schneider2017-12-074-0/+30
| * | | | | | | | | | refactor "dumb" terminal determinationLars Schneider2017-12-044-7/+11
* | | | | | | | | | | Merge branch 'sg/setup-doc-update'Junio C Hamano2017-12-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | setup.c: fix comment about order of .git directory discoverysg/setup-doc-updateSZEDER Gábor2017-12-071-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ar/unconfuse-three-dots'Junio C Hamano2017-12-1925-24/+458
|\ \ \ \ \ \ \ \ \ \ \