summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Git 2.22.1v2.22.1Junio C Hamano2019-08-112-1/+4
* .mailmap: update email address of Philip OakleyPhilip Oakley2019-08-111-0/+1
* Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maintJunio C Hamano2019-08-093-8/+0
|\
| * xdiff: remove duplicate headers from xpatience.cCarlo Marcelo Arenas Belón2019-07-281-2/+0
| * xdiff: remove duplicate headers from xhistogram.cCarlo Marcelo Arenas Belón2019-07-281-2/+0
| * xdiff: drop system includes in xutils.cCarlo Marcelo Arenas Belón2019-07-281-4/+0
* | Merge branch 'jk/no-system-includes-in-dot-c' into maintJunio C Hamano2019-08-093-3/+0
|\|
| * wt-status.h: drop stdio.h includeJeff King2019-06-191-1/+0
| * verify-tag: drop signal.h includeJeff King2019-06-192-2/+0
* | Merge branch 'sg/fsck-config-in-doc' into maintJunio C Hamano2019-08-091-0/+5
|\ \
| * | Documentation/git-fsck.txt: include fsck.* config variablesSZEDER Gábor2019-07-291-0/+5
* | | Merge branch 'jk/xdiff-clamp-funcname-context-index' into maintJunio C Hamano2019-08-092-2/+24
|\ \ \
| * | | xdiff: clamp function context indices in post-imageJeff King2019-07-232-2/+24
* | | | RelNotes/2.21.1: typofixMartin Ågren2019-08-011-1/+1
* | | | Merge fixes made on the 'master' frontJunio C Hamano2019-07-291-1/+72
* | | | Merge branch 'jc/post-c89-rules-doc' into maintJunio C Hamano2019-07-291-3/+23
|\ \ \ \
| * | | | CodingGuidelines: spell out post-C89 rulesJunio C Hamano2019-07-181-3/+23
| | |_|/ | |/| |
* | | | Merge branch 'fc/fetch-with-import-fix' into maintJunio C Hamano2019-07-293-23/+45
|\ \ \ \
| * | | | fetch: fix regression with transport helpersFelipe Contreras2019-06-042-3/+4
| * | | | fetch: make the code more understandableFelipe Contreras2019-06-041-7/+9
| * | | | fetch: trivial cleanupFelipe Contreras2019-06-041-3/+8
| * | | | t5801 (remote-helpers): add test to fetch tagsFelipe Contreras2019-06-042-5/+22
| * | | | t5801 (remote-helpers): cleanup refspec stuffFelipe Contreras2019-06-042-11/+8
* | | | | Merge branch 'ds/close-object-store' into maintJunio C Hamano2019-07-2919-327/+398
|\ \ \ \ \
| * | | | | packfile: rename close_all_packs to close_object_storeDerrick Stolee2019-06-1211-12/+12
| * | | | | packfile: close commit-graph in close_all_packsDerrick Stolee2019-06-121-0/+3
| * | | | | commit-graph: use raw_object_store when closingDerrick Stolee2019-06-123-6/+6
| * | | | | commit-graph: extract write_commit_graph_file()Derrick Stolee2019-06-121-75/+80
| * | | | | commit-graph: extract copy_oids_to_commits()Derrick Stolee2019-06-121-25/+32
| * | | | | commit-graph: extract count_distinct_commits()Derrick Stolee2019-06-121-13/+22
| * | | | | commit-graph: extract fill_oids_from_all_packs()Derrick Stolee2019-06-121-11/+15
| * | | | | commit-graph: extract fill_oids_from_commit_hex()Derrick Stolee2019-06-121-32/+40
| * | | | | commit-graph: extract fill_oids_from_packs()Derrick Stolee2019-06-121-36/+47
| * | | | | commit-graph: create write_commit_graph_contextDerrick Stolee2019-06-121-196/+194
| * | | | | commit-graph: remove Future Work sectionDerrick Stolee2019-06-121-17/+0
| * | | | | commit-graph: collapse parameters into flagsDerrick Stolee2019-06-125-13/+18
| * | | | | commit-graph: return with errors during writeDerrick Stolee2019-06-126-39/+77
| * | | | | commit-graph: fix the_repository referenceDerrick Stolee2019-05-131-1/+1
* | | | | | Merge branch 'pw/add-p-recount' into maintJunio C Hamano2019-07-292-1/+13
|\ \ \ \ \ \
| * | | | | | add -p: fix checkout -p with pathological contextPhillip Wood2019-06-132-1/+13
* | | | | | | Merge branch 'rs/avoid-overflow-in-midpoint-computation' into maintJunio C Hamano2019-07-296-7/+8
|\ \ \ \ \ \ \
| * | | | | | | cleanup: fix possible overflow errors in binary search, part 2René Scharfe2019-06-136-7/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/trailers-use-config' into maintJunio C Hamano2019-07-292-27/+47
|\ \ \ \ \ \ \
| * | | | | | | interpret-trailers: load default configJeff King2019-06-192-27/+47
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'tg/stash-ref-by-index-fix' into maintJunio C Hamano2019-07-292-4/+23
|\ \ \ \ \ \ \
| * | | | | | | stash: fix show referencing stash indexThomas Gummerer2019-06-192-4/+23
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'pw/rebase-abort-clean-rewritten' into maintJunio C Hamano2019-07-293-15/+53
|\ \ \ \ \ \ \
| * | | | | | | rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood2019-05-152-10/+42
| * | | | | | | sequencer: return errors from sequencer_remove_state()Phillip Wood2019-05-151-4/+7
| * | | | | | | rebase: warn if state directory cannot be removedPhillip Wood2019-05-151-3/+5