summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/fetch-tags-noclobber'Junio C Hamano2018-09-174-24/+94
|\
| * fetch: stop clobbering existing tags without --forceÆvar Arnfjörð Bjarmason2018-08-311-4/+11
| * fetch: document local ref updates with/without --forceÆvar Arnfjörð Bjarmason2018-08-312-10/+37
| * push doc: correct lies about how push refspecs workÆvar Arnfjörð Bjarmason2018-08-312-11/+48
| * push doc: move mention of "tag <tag>" later in the proseÆvar Arnfjörð Bjarmason2018-08-311-2/+2
| * push doc: remove confusing mention of remote mergerÆvar Arnfjörð Bjarmason2018-08-311-2/+1
* | Merge branch 'es/worktree-forced-ops-fix'Junio C Hamano2018-09-172-3/+11
|\ \
| * | doc-diff: force worktree addJeff King2018-09-051-1/+1
| * | worktree: teach 'remove' to override lock when --force given twiceEric Sunshine2018-08-301-0/+1
| * | worktree: teach 'move' to override lock when --force given twiceEric Sunshine2018-08-301-0/+3
| * | worktree: teach 'add' to respect --force for registered but missing pathEric Sunshine2018-08-301-2/+6
* | | Merge branch 'sg/doc-trace-appends'Junio C Hamano2018-09-171-2/+2
|\ \ \
| * | | Documentation/git.txt: clarify that GIT_TRACE=/path appendsSZEDER Gábor2018-09-041-2/+2
* | | | Merge branch 'jk/diff-rendered-docs'Junio C Hamano2018-09-172-9/+32
|\ \ \ \
| * | | | Revert "doc/Makefile: drop doc-diff worktree and temporary files on "make cle...Junio C Hamano2018-09-171-1/+0
| * | | | doc/Makefile: drop doc-diff worktree and temporary files on "make clean"Eric Sunshine2018-08-311-0/+1
| * | | | doc-diff: add --clean mode to remove temporary working gunkEric Sunshine2018-08-311-3/+16
| * | | | doc-diff: fix non-portable 'man' invocationEric Sunshine2018-08-311-1/+1
| * | | | doc-diff: always use oids inside worktreeJeff King2018-08-301-4/+4
| * | | | SubmittingPatches: mention doc-diffJeff King2018-08-212-1/+11
* | | | | Merge branch 'tg/rerere-doc-updates'Junio C Hamano2018-09-172-0/+10
|\ \ \ \ \
| * | | | | rerere: add note about files with existing conflict markersThomas Gummerer2018-08-291-0/+6
| * | | | | rerere: mention caveat about unmatched conflict markersThomas Gummerer2018-08-291-0/+4
* | | | | | Merge branch 'es/format-patch-rangediff'Junio C Hamano2018-09-171-0/+19
|\ \ \ \ \ \
| * | | | | | format-patch: allow --range-diff to apply to a lone-patchEric Sunshine2018-08-141-1/+2
| * | | | | | format-patch: add --creation-factor tweak for --range-diffEric Sunshine2018-08-141-1/+7
| * | | | | | format-patch: extend --range-diff to accept revision rangeEric Sunshine2018-08-141-3/+5
| * | | | | | format-patch: add --range-diff option to embed diff in cover letterEric Sunshine2018-08-141-0/+10
| * | | | | | Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediffJunio C Hamano2018-08-141-0/+10
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'es/format-patch-interdiff'Junio C Hamano2018-09-171-0/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | format-patch: allow --interdiff to apply to a lone-patchEric Sunshine2018-07-231-1/+2
| * | | | | | | format-patch: add --interdiff option to embed diff in cover letterEric Sunshine2018-07-231-0/+9
* | | | | | | | Merge branch 'cc/delta-islands'Junio C Hamano2018-09-173-0/+121
|\ \ \ \ \ \ \ \
| * | | | | | | | repack: add delta-islands supportJeff King2018-08-162-0/+9
| * | | | | | | | pack-objects: add delta-islands supportJeff King2018-08-162-0/+112
* | | | | | | | | Merge branch 'jk/trailer-fixes'Junio C Hamano2018-09-171-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | interpret-trailers: allow suppressing "---" dividerJeff King2018-08-231-1/+6
| * | | | | | | | | interpret-trailers: tighten check for "---" patch boundaryJeff King2018-08-231-2/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tg/rerere'Junio C Hamano2018-09-171-0/+182
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | rerere: teach rerere to handle nested conflictsThomas Gummerer2018-08-061-0/+42
| * | | | | | | | rerere: add documentation for conflict normalizationThomas Gummerer2018-08-061-0/+140
* | | | | | | | | Merge branch 'ds/multi-pack-index'Junio C Hamano2018-09-174-0/+247
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Sync 'ds/multi-pack-index' to v2.19.0-rc0Junio C Hamano2018-08-204-0/+247
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | config: create core.multiPackIndex settingDerrick Stolee2018-07-201-0/+5
| | * | | | | | | | | midx: write object offsetsDerrick Stolee2018-07-201-1/+14
| | * | | | | | | | | midx: write object id fanout chunkDerrick Stolee2018-07-201-0/+5
| | * | | | | | | | | midx: write object ids in a chunkDerrick Stolee2018-07-201-0/+4
| | * | | | | | | | | multi-pack-index: write pack names in chunkDerrick Stolee2018-07-201-0/+6
| | * | | | | | | | | multi-pack-index: add 'write' verbDerrick Stolee2018-07-201-1/+21
| | * | | | | | | | | multi-pack-index: add builtinDerrick Stolee2018-07-201-0/+36