summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/add-p-allowed-options-fix'Junio C Hamano2020-09-031-25/+42
|\
| * add -p: fix checking of user inputPhillip Wood2020-08-171-16/+38
| * add -p: use ALLOC_GROW_BY instead of ALLOW_GROWPhillip Wood2020-08-171-9/+4
* | Merge branch 'jt/fetch-pack-loosen-validation-with-packfile-uri'Junio C Hamano2020-09-035-1/+72
|\ \
| * | fetch-pack: make packfile URIs work with transfer.fsckobjectsJonathan Tan2020-08-242-1/+54
| * | fetch-pack: document only_packfile in get_pack()Jonathan Tan2020-08-241-0/+4
| * | (various): document from_promisor parameterJonathan Tan2020-08-243-0/+14
* | | Merge branch 'ss/t7401-modernize'Junio C Hamano2020-09-031-73/+76
|\ \ \
| * | | t7401: add a NEEDSWORKShourya Shukla2020-08-211-1/+4
| * | | t7401: change indentation for enhanced readabilityShourya Shukla2020-08-211-65/+65
| * | | t7401: change syntax of test_i18ncmp calls for clarityShourya Shukla2020-08-211-5/+5
| * | | t7401: use 'short' instead of 'verify' and cut in rev-parse callsShourya Shukla2020-08-211-2/+2
| * | | t7401: modernize styleShourya Shukla2020-08-211-1/+1
* | | | Merge branch 'pw/rebase-i-more-options'Junio C Hamano2020-09-0311-49/+423
|\ \ \ \
| * | | | t3436: do not run git-merge-recursive in dashed formJunio C Hamano2020-08-261-1/+1
| * | | | rebase: add --reset-author-dateRohit Ashiwal2020-08-193-14/+25
| * | | | rebase -i: support --ignore-datePhillip Wood2020-08-195-20/+123
| * | | | rebase -i: support --committer-date-is-author-datePhillip Wood2020-08-176-13/+162
| * | | | am: stop exporting GIT_COMMITTER_DATEPhillip Wood2020-08-176-28/+52
| * | | | rebase -i: add --ignore-whitespace flagRohit Ashiwal2020-07-134-6/+93
* | | | | Twelfth batchJunio C Hamano2020-08-311-0/+39
* | | | | Merge branch 'ps/ref-transaction-hook'Junio C Hamano2020-08-312-12/+12
|\ \ \ \ \
| * | | | | refs: remove lookup cache for reference-transaction hookPatrick Steinhardt2020-08-252-12/+12
* | | | | | Merge branch 'jk/rev-input-given-fix'Junio C Hamano2020-08-313-5/+26
|\ \ \ \ \ \
| * | | | | | revision: set rev_input_given in handle_revision_arg()Jeff King2020-08-263-5/+26
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jc/ident-whose-ident'Junio C Hamano2020-08-312-18/+43
|\ \ \ \ \ \
| * | | | | | ident: say whose identity is missing when giving user.name hintJunio C Hamano2020-08-212-18/+43
* | | | | | | Merge branch 'rp/apply-cached-doc'Junio C Hamano2020-08-311-10/+10
|\ \ \ \ \ \ \
| * | | | | | | git-apply.txt: update descriptions of --cached, --indexRaymond E. Pasco2020-08-201-10/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rs/checkout-no-overlay-pathspec-fix'Junio C Hamano2020-08-313-3/+30
|\ \ \ \ \ \ \
| * | | | | | | checkout, restore: make pathspec recursiveRené Scharfe2020-08-223-3/+30
* | | | | | | | Merge branch 'al/bisect-first-parent'Junio C Hamano2020-08-311-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | bisect: add first-parent option to documentationAaron Lipman2020-08-221-1/+1
* | | | | | | | | Merge branch 'jk/refspecs-cleanup'Junio C Hamano2020-08-313-13/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refspec: make sure stack refspec_item variables are zeroedJacob Keller2020-08-172-0/+2
| * | | | | | | | | refspec: fix documentation referring to refspec_itemJacob Keller2020-08-171-13/+14
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'hn/refs-pseudorefs'Junio C Hamano2020-08-318-48/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sequencer: treat REVERT_HEAD as a pseudo refHan-Wen Nienhuys2020-08-214-14/+13
| * | | | | | | | | builtin/commit: suggest update-ref for pseudoref removalHan-Wen Nienhuys2020-08-211-14/+12
| * | | | | | | | | sequencer: treat CHERRY_PICK_HEAD as a pseudo refHan-Wen Nienhuys2020-08-215-23/+33
| * | | | | | | | | refs: make refs_ref_exists publicHan-Wen Nienhuys2020-08-212-1/+3
* | | | | | | | | | Merge branch 'jk/index-pack-w-more-threads'Junio C Hamano2020-08-314-26/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | index-pack: adjust default threading capJeff King2020-08-211-3/+16
| * | | | | | | | | | p5302: count up to online-cpus for thread testsJeff King2020-08-211-23/+24
| * | | | | | | | | | p5302: disable thread-count parameter tests by defaultJeff King2020-08-213-5/+16
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'hv/ref-filter-trailers-atom-parsing-fix'Junio C Hamano2020-08-312-41/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ref-filter: 'contents:trailers' show error if `:` is missingHariom Verma2020-08-212-3/+13
| * | | | | | | | | | t6300: unify %(trailers) and %(contents:trailers) testsHariom Verma2020-08-211-42/+14
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jt/promisor-pack-fix'Junio C Hamano2020-08-312-7/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch-pack: in partial clone, pass --promisorJonathan Tan2020-08-202-7/+26
| | |_|_|_|_|/ / / / | |/| | | | | | | |