summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/azure-pipelines-msvc'Junio C Hamano2019-10-1514-33/+430
|\
| * ci: also build and test with MS Visual Studio on Azure PipelinesJohannes Schindelin2019-10-062-0/+163
| * ci: really use shallow clones on Azure PipelinesJohannes Schindelin2019-10-061-3/+2
| * tests: let --immediate and --write-junit-xml play well togetherJohannes Schindelin2019-10-061-16/+22
| * test-tool run-command: learn to run (parts of) the testsuiteJohannes Schindelin2019-10-061-0/+153
| * vcxproj: include more generated filesJohannes Schindelin2019-10-061-3/+6
| * vcxproj: only copy `git-remote-http.exe` once it was builtJohannes Schindelin2019-10-062-3/+10
| * msvc: work around a bug in GetEnvironmentVariable()Johannes Schindelin2019-10-061-0/+2
| * msvc: handle DEVELOPER=1Johannes Schindelin2019-10-061-0/+46
| * msvc: ignore some libraries when linkingJohannes Schindelin2019-10-061-1/+1
| * compat/win32/path-utils.h: add #include guardsJohannes Schindelin2019-10-061-0/+5
| * winansi: use FLEX_ARRAY to avoid compiler warningJohannes Schindelin2019-10-061-1/+1
| * msvc: avoid using minus operator on unsigned typesJohannes Schindelin2019-10-063-4/+17
| * push: do not pretend to return `int` from `die_push_simple()`Johannes Schindelin2019-10-041-2/+2
* | Merge branch 'gs/commit-graph-trace-with-cmd'Junio C Hamano2019-10-151-0/+6
|\ \
| * | commit-graph: emit trace2 cmd_mode for each sub-commandGarima Singh2019-10-021-0/+6
* | | Merge branch 'js/fetch-jobs'Junio C Hamano2019-10-154-21/+137
|\ \ \
| * | | fetch: let --jobs=<n> parallelize --multiple, tooJohannes Schindelin2019-10-064-21/+137
* | | | Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2019-10-1512-334/+736
|\ \ \ \
| * | | | merge-recursive: fix the fix to the diff3 common ancestor labelElijah Newren2019-10-081-1/+2
| * | | | merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren2019-10-022-1/+19
| * | | | merge-recursive: alphabetize include listElijah Newren2019-08-191-16/+17
| * | | | merge-recursive: add sanity checks for relevant merge_optionsElijah Newren2019-08-191-0/+24
| * | | | merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Elijah Newren2019-08-192-10/+10
| * | | | merge-recursive: split internal fields into a separate structElijah Newren2019-08-192-97/+105
| * | | | merge-recursive: avoid losing output and leaking memory holding that outputElijah Newren2019-08-192-4/+5
| * | | | merge-recursive: comment and reorder the merge_options fieldsElijah Newren2019-08-192-19/+37
| * | | | merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren2019-08-192-20/+13
| * | | | merge-recursive: move some definitions around to clean up the headerElijah Newren2019-08-192-45/+73
| * | | | merge-recursive: rename merge_options argument to opt in headerElijah Newren2019-08-191-8/+8
| * | | | merge-recursive: rename 'mrtree' to 'result_tree', for clarityElijah Newren2019-08-191-3/+4
| * | | | merge-recursive: use common name for ancestors/common/base_listElijah Newren2019-08-192-42/+44
| * | | | merge-recursive: fix some overly long linesElijah Newren2019-08-191-6/+13
| * | | | cache-tree: share code between functions writing an index as a treeElijah Newren2019-08-195-58/+67
| * | | | merge-recursive: don't force external callers to do our loggingElijah Newren2019-08-192-5/+3
| * | | | merge-recursive: remove useless parameter in merge_trees()Elijah Newren2019-08-194-12/+22
| * | | | merge-recursive: exit early if index != headElijah Newren2019-08-191-29/+72
| * | | | Ensure index matches head before invoking merge machinery, round NElijah Newren2019-08-193-1/+14
| * | | | merge-recursive: remove another implicit dependency on the_repositoryElijah Newren2019-08-191-2/+5
| * | | | merge-recursive: future-proof update_file_flags() against memory leaksElijah Newren2019-08-191-3/+5
| * | | | merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee2019-08-193-11/+21
| * | | | merge-recursive: provide a better label for diff3 common ancestorElijah Newren2019-08-193-4/+209
| * | | | merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Elijah Newren2019-08-161-10/+9
| * | | | checkout: provide better conflict hunk description with detached HEADElijah Newren2019-08-161-0/+8
| * | | | merge-recursive: be consistent with assertElijah Newren2019-08-161-1/+1
* | | | | Eighth batchJunio C Hamano2019-10-111-0/+30
* | | | | Merge branch 'dl/rev-list-doc-cleanup'Junio C Hamano2019-10-111-53/+1
|\ \ \ \ \
| * | | | | git-rev-list.txt: prune options in synopsisDenton Liu2019-10-061-53/+1
| |/ / / /
* | | | | Merge branch 'kt/add-i-progress'Junio C Hamano2019-10-112-2/+2
|\ \ \ \ \
| * | | | | add -i: show progress counter in the promptKunal Tyagi2019-10-042-2/+2
| | |_|/ / | |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 02:11:28 +0100