summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pb/recurse-submodules-fix'Junio C Hamano2020-03-273-25/+51
|\
| * t/lib-submodule-update: add test removing nested submodulesPhilippe Blain2020-02-201-2/+18
| * unpack-trees: check for missing submodule directory in merged_entryPhilippe Blain2020-02-202-2/+16
| * unpack-trees: remove outdated description for verify_clean_submodulePhilippe Blain2020-02-201-3/+0
| * t/lib-submodule-update: move a test to the right sectionPhilippe Blain2020-02-201-16/+17
| * t/lib-submodule-update: remove outdated test descriptionPhilippe Blain2020-02-201-1/+0
| * t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTEDPhilippe Blain2020-02-201-1/+0
* | The first batch post 2.26 cycleJunio C Hamano2020-03-253-2/+43
* | Merge branch 'ss/submodule-foreach-cb'Junio C Hamano2020-03-251-4/+4
|\ \
| * | submodule--helper.c: Rename 'cb_foreach' to 'foreach_cb'Shourya Shukla2020-03-181-4/+4
* | | Merge branch 'jc/config-tar'Junio C Hamano2020-03-253-7/+8
|\ \ \
| * | | separate tar.* config to its own source fileJunio C Hamano2020-03-183-7/+8
* | | | Merge branch 'en/oidset-uninclude-hashmap'Junio C Hamano2020-03-251-1/+0
|\ \ \ \
| * | | | oidset: remove unnecessary includeElijah Newren2020-03-151-1/+0
* | | | | Merge branch 'ds/check-connected-reprepare-packed-git'Junio C Hamano2020-03-251-0/+4
|\ \ \ \ \
| * | | | | connected.c: reprepare packs for corner casesDerrick Stolee2020-03-151-0/+4
* | | | | | Merge branch 'rs/doc-passthru-fetch-options'Junio C Hamano2020-03-251-3/+7
|\ \ \ \ \ \
| * | | | | | pull: document more passthru optionsRené Scharfe2020-03-111-3/+7
* | | | | | | Merge branch 'pw/advise-rebase-skip'Junio C Hamano2020-03-258-46/+233
|\ \ \ \ \ \ \
| * | | | | | | commit: give correct advice for empty commit during a rebasePhillip Wood2019-12-065-19/+114
| * | | | | | | commit: encapsulate determine_whence() for sequencerPhillip Wood2019-12-063-6/+15
| * | | | | | | commit: use enum value for multiple cherry-picksPhillip Wood2019-12-062-15/+19
| * | | | | | | sequencer: write CHERRY_PICK_HEAD for reword and editPhillip Wood2019-12-062-1/+56
| * | | | | | | cherry-pick: check commit error messagesPhillip Wood2019-12-061-0/+23
| * | | | | | | cherry-pick: add test for `--skip` advice in `git commit`Johannes Schindelin2019-12-061-1/+2
| * | | | | | | t3404: use test_cmp_revPhillip Wood2019-12-061-19/+19
* | | | | | | | Merge branch 'yz/p4-py3'Junio C Hamano2020-03-252-95/+146
|\ \ \ \ \ \ \ \
| * | | | | | | | ci: use python3 in linux-gcc and osx-gcc and python2 elsewhereSZEDER Gábor2020-03-101-0/+6
| * | | | | | | | git-p4: use python3's input() everywhereYang Zhao2020-01-151-2/+12
| * | | | | | | | git-p4: simplify regex pattern generation for parsing diff-treeYang Zhao2020-01-151-7/+6
| * | | | | | | | git-p4: use dict.items() iteration for python3 compatibilityYang Zhao2020-01-151-1/+1
| * | | | | | | | git-p4: use functools.reduce instead of reduceYang Zhao2020-01-151-1/+2
| * | | | | | | | git-p4: fix freezing while waiting for fast-import progressYang Zhao2020-01-151-0/+1
| * | | | | | | | git-p4: use marshal format version 2 when sending to p4Yang Zhao2020-01-151-1/+2
| * | | | | | | | git-p4: open .gitp4-usercache.txt in text modeYang Zhao2020-01-151-2/+2
| * | | | | | | | git-p4: convert path to unicode before processing themYang Zhao2020-01-151-25/+44
| * | | | | | | | git-p4: encode/decode communication with git for python3Yang Zhao2020-01-151-4/+17
| * | | | | | | | git-p4: encode/decode communication with p4 for python3Yang Zhao2020-01-151-13/+46
| * | | | | | | | git-p4: remove string type aliasingYang Zhao2020-01-151-16/+0
| * | | | | | | | git-p4: change the expansion test from basestring to listBen Keene2020-01-151-9/+9
| * | | | | | | | git-p4: make python2.7 the oldest supported versionYang Zhao2020-01-151-18/+2
* | | | | | | | | Merge branch 'am/real-path-fix'Junio C Hamano2020-03-2516-75/+107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | get_superproject_working_tree(): return strbufAlexandr Miloslavskiy2020-03-103-14/+14
| * | | | | | | | | real_path_if_valid(): remove unsafe APIAlexandr Miloslavskiy2020-03-106-26/+14
| * | | | | | | | | real_path: remove unsafe APIAlexandr Miloslavskiy2020-03-1013-24/+59
| * | | | | | | | | set_git_dir: fix crash when used with real_path()Alexandr Miloslavskiy2020-03-065-14/+23
* | | | | | | | | | Merge branch 'sg/commit-slab-clarify-peek'Junio C Hamano2020-03-251-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit-slab: clarify slabname##_peek()'s return valueSZEDER Gábor2020-03-101-1/+6
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/maintain-doc'Junio C Hamano2020-03-251-13/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update how-to-maintain-gitJunio C Hamano2020-03-091-13/+39
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |