Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'es/format-patch-rangediff' | Junio C Hamano | 2018-09-17 | 1 | -0/+19 |
|\ | |||||
| * | format-patch: allow --range-diff to apply to a lone-patch | Eric Sunshine | 2018-08-14 | 1 | -1/+2 |
| * | format-patch: add --creation-factor tweak for --range-diff | Eric Sunshine | 2018-08-14 | 1 | -1/+7 |
| * | format-patch: extend --range-diff to accept revision range | Eric Sunshine | 2018-08-14 | 1 | -3/+5 |
| * | format-patch: add --range-diff option to embed diff in cover letter | Eric Sunshine | 2018-08-14 | 1 | -0/+10 |
| * | Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff | Junio C Hamano | 2018-08-14 | 1 | -0/+10 |
| |\ | |||||
* | \ | Merge branch 'es/format-patch-interdiff' | Junio C Hamano | 2018-09-17 | 1 | -0/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | format-patch: allow --interdiff to apply to a lone-patch | Eric Sunshine | 2018-07-23 | 1 | -1/+2 |
| * | | format-patch: add --interdiff option to embed diff in cover letter | Eric Sunshine | 2018-07-23 | 1 | -0/+9 |
* | | | Merge branch 'cc/delta-islands' | Junio C Hamano | 2018-09-17 | 3 | -0/+121 |
|\ \ \ | |||||
| * | | | repack: add delta-islands support | Jeff King | 2018-08-16 | 2 | -0/+9 |
| * | | | pack-objects: add delta-islands support | Jeff King | 2018-08-16 | 2 | -0/+112 |
* | | | | Merge branch 'jk/trailer-fixes' | Junio C Hamano | 2018-09-17 | 1 | -2/+8 |
|\ \ \ \ | |||||
| * | | | | interpret-trailers: allow suppressing "---" divider | Jeff King | 2018-08-23 | 1 | -1/+6 |
| * | | | | interpret-trailers: tighten check for "---" patch boundary | Jeff King | 2018-08-23 | 1 | -2/+3 |
* | | | | | Merge branch 'tg/rerere' | Junio C Hamano | 2018-09-17 | 1 | -0/+182 |
|\ \ \ \ \ | |||||
| * | | | | | rerere: teach rerere to handle nested conflicts | Thomas Gummerer | 2018-08-06 | 1 | -0/+42 |
| * | | | | | rerere: add documentation for conflict normalization | Thomas Gummerer | 2018-08-06 | 1 | -0/+140 |
* | | | | | | Merge branch 'ds/multi-pack-index' | Junio C Hamano | 2018-09-17 | 4 | -0/+247 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Sync 'ds/multi-pack-index' to v2.19.0-rc0 | Junio C Hamano | 2018-08-21 | 4 | -0/+247 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | config: create core.multiPackIndex setting | Derrick Stolee | 2018-07-20 | 1 | -0/+5 |
| | * | | | | | | midx: write object offsets | Derrick Stolee | 2018-07-20 | 1 | -1/+14 |
| | * | | | | | | midx: write object id fanout chunk | Derrick Stolee | 2018-07-20 | 1 | -0/+5 |
| | * | | | | | | midx: write object ids in a chunk | Derrick Stolee | 2018-07-20 | 1 | -0/+4 |
| | * | | | | | | multi-pack-index: write pack names in chunk | Derrick Stolee | 2018-07-20 | 1 | -0/+6 |
| | * | | | | | | multi-pack-index: add 'write' verb | Derrick Stolee | 2018-07-20 | 1 | -1/+21 |
| | * | | | | | | multi-pack-index: add builtin | Derrick Stolee | 2018-07-20 | 1 | -0/+36 |
| | * | | | | | | multi-pack-index: add format details | Derrick Stolee | 2018-07-12 | 1 | -0/+49 |
| | * | | | | | | multi-pack-index: add design document | Derrick Stolee | 2018-07-12 | 1 | -0/+109 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge branch 'jk/branch-l-1-repurpose' | Junio C Hamano | 2018-09-17 | 1 | -7/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc/git-branch: remove obsolete "-l" references | Jeff King | 2018-08-30 | 1 | -5/+1 |
| * | | | | | | | branch: make "-l" a synonym for "--list" | Jeff King | 2018-06-22 | 1 | -2/+1 |
* | | | | | | | | Merge branch 'ts/doc-build-manpage-xsl-quietly' | Junio C Hamano | 2018-09-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation/Makefile: make manpage-base-url.xsl generation quieter | Tim Schumacher | 2018-08-29 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'bp/checkout-new-branch-optim' | Junio C Hamano | 2018-09-17 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout: optimize "git checkout -b <new_branch>" | Ben Peart | 2018-08-16 | 1 | -0/+8 |
* | | | | | | | | | | Git 2.19v2.19.0 | Junio C Hamano | 2018-09-10 | 1 | -8/+0 |
* | | | | | | | | | | Git 2.19-rc2v2.19.0-rc2 | Junio C Hamano | 2018-09-04 | 1 | -0/+23 |
* | | | | | | | | | | Getting ready for -rc1 | Junio C Hamano | 2018-08-27 | 1 | -1/+34 |
* | | | | | | | | | | Merge branch 'ds/commit-graph-fsck' | Junio C Hamano | 2018-08-27 | 1 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | config: fix commit-graph related config docs | Derrick Stolee | 2018-08-23 | 1 | -6/+11 |
* | | | | | | | | | | | Merge branch 'nd/complete-config-vars' | Junio C Hamano | 2018-08-27 | 2 | -12/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | generate-cmdlist.sh: collect config from all config.txt files | Nguyễn Thái Ngọc Duy | 2018-08-21 | 2 | -12/+12 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ep/worktree-quiet-option' | Junio C Hamano | 2018-08-27 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | worktree: add --quiet option | Elia Pinto | 2018-08-18 | 1 | -0/+4 |
* | | | | | | | | | | | | Merge branch 'sm/branch-sort-config' | Junio C Hamano | 2018-08-27 | 2 | -2/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | branch: support configuring --sort via .gitconfig | Samuel Maftoul | 2018-08-16 | 2 | -2/+9 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'nd/config-core-checkstat-doc' | Junio C Hamano | 2018-08-27 | 1 | -4/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | config.txt: clarify core.checkStat | Junio C Hamano | 2018-08-17 | 1 | -4/+14 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Git 2.19-rc0v2.19.0-rc0 | Junio C Hamano | 2018-08-20 | 1 | -0/+80 |