Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/fetch-tags-noclobber' | Junio C Hamano | 2018-09-17 | 4 | -24/+94 |
|\ | |||||
| * | fetch: stop clobbering existing tags without --force | Ævar Arnfjörð Bjarmason | 2018-08-31 | 1 | -4/+11 |
| * | fetch: document local ref updates with/without --force | Ævar Arnfjörð Bjarmason | 2018-08-31 | 2 | -10/+37 |
| * | push doc: correct lies about how push refspecs work | Ævar Arnfjörð Bjarmason | 2018-08-31 | 2 | -11/+48 |
| * | push doc: move mention of "tag <tag>" later in the prose | Ævar Arnfjörð Bjarmason | 2018-08-31 | 1 | -2/+2 |
| * | push doc: remove confusing mention of remote merger | Ævar Arnfjörð Bjarmason | 2018-08-31 | 1 | -2/+1 |
* | | Merge branch 'es/worktree-forced-ops-fix' | Junio C Hamano | 2018-09-17 | 2 | -3/+11 |
|\ \ | |||||
| * | | doc-diff: force worktree add | Jeff King | 2018-09-05 | 1 | -1/+1 |
| * | | worktree: teach 'remove' to override lock when --force given twice | Eric Sunshine | 2018-08-30 | 1 | -0/+1 |
| * | | worktree: teach 'move' to override lock when --force given twice | Eric Sunshine | 2018-08-30 | 1 | -0/+3 |
| * | | worktree: teach 'add' to respect --force for registered but missing path | Eric Sunshine | 2018-08-30 | 1 | -2/+6 |
* | | | Merge branch 'sg/doc-trace-appends' | Junio C Hamano | 2018-09-17 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Documentation/git.txt: clarify that GIT_TRACE=/path appends | SZEDER Gábor | 2018-09-04 | 1 | -2/+2 |
* | | | | Merge branch 'jk/diff-rendered-docs' | Junio C Hamano | 2018-09-17 | 2 | -9/+32 |
|\ \ \ \ | |||||
| * | | | | Revert "doc/Makefile: drop doc-diff worktree and temporary files on "make cle... | Junio C Hamano | 2018-09-17 | 1 | -1/+0 |
| * | | | | doc/Makefile: drop doc-diff worktree and temporary files on "make clean" | Eric Sunshine | 2018-08-31 | 1 | -0/+1 |
| * | | | | doc-diff: add --clean mode to remove temporary working gunk | Eric Sunshine | 2018-08-31 | 1 | -3/+16 |
| * | | | | doc-diff: fix non-portable 'man' invocation | Eric Sunshine | 2018-08-31 | 1 | -1/+1 |
| * | | | | doc-diff: always use oids inside worktree | Jeff King | 2018-08-30 | 1 | -4/+4 |
| * | | | | SubmittingPatches: mention doc-diff | Jeff King | 2018-08-21 | 2 | -1/+11 |
* | | | | | Merge branch 'tg/rerere-doc-updates' | Junio C Hamano | 2018-09-17 | 2 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | rerere: add note about files with existing conflict markers | Thomas Gummerer | 2018-08-29 | 1 | -0/+6 |
| * | | | | | rerere: mention caveat about unmatched conflict markers | Thomas Gummerer | 2018-08-29 | 1 | -0/+4 |
* | | | | | | 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-20 | 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 |