summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/commit-m-with-fixup'Junio C Hamano2018-01-233-4/+15
|\
| * commit: add support for --fixup <commit> -m"<extra message>"ab/commit-m-with-fixupÆvar Arnfjörð Bjarmason2017-12-223-6/+14
| * commit doc: document that -c, -C, -F and --fixup with -m errorÆvar Arnfjörð Bjarmason2017-12-221-0/+3
* | Merge branch 'cc/codespeed'Junio C Hamano2018-01-232-54/+137
|\ \
| * | perf/run: read GIT_PERF_REPO_NAME from perf.repoNamecc/codespeedChristian Couder2018-01-051-0/+3
| * | perf/run: learn to send output to codespeed serverChristian Couder2018-01-051-1/+11
| * | perf/run: learn about perf.codespeedOutputChristian Couder2018-01-051-1/+6
| * | perf/run: add conf_opts argument to get_var_from_env_or_config()Christian Couder2018-01-051-5/+6
| * | perf/aggregate: implement codespeed JSON outputChristian Couder2018-01-051-2/+62
| * | perf/aggregate: refactor printing resultsChristian Couder2018-01-051-46/+50
| * | perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION}Christian Couder2018-01-051-1/+1
* | | Merge branch 'ab/perf-grep-threads'Junio C Hamano2018-01-232-21/+86
|\ \ \
| * | | perf: amend the grep tests to test grep.threadsab/perf-grep-threadsÆvar Arnfjörð Bjarmason2018-01-042-21/+86
* | | | Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano2018-01-238-40/+155
|\ \ \ \
| * | | | diff: use HAS_MULTI_BITS instead of counting bits manuallysb/diff-blobfind-pickaxeStefan Beller2018-01-041-10/+5
| * | | | diff: properly error out when combining multiple pickaxe optionsStefan Beller2018-01-042-1/+3
| * | | | diffcore: add a pickaxe option to find a specific blobStefan Beller2018-01-046-20/+135
| * | | | diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller2018-01-045-6/+8
| * | | | diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bitStefan Beller2018-01-043-5/+6
| * | | | diff.h: make pickaxe_opts an unsigned bit fieldStefan Beller2018-01-041-1/+1
* | | | | Merge branch 'jk/abort-clone-with-existing-dest'Junio C Hamano2018-01-232-33/+98
|\ \ \ \ \
| * | | | | clone: do not clean up directories we didn't createjk/abort-clone-with-existing-destJeff King2018-01-032-9/+67
| * | | | | clone: factor out dir_exists() helperJeff King2018-01-031-3/+8
| * | | | | t5600: modernize styleJeff King2018-01-031-23/+25
| * | | | | t5600: fix outdated comment about unborn HEADJeff King2018-01-031-1/+1
* | | | | | Merge branch 'jc/merge-symlink-ours-theirs'Junio C Hamano2018-01-232-4/+45
|\ \ \ \ \ \
| * | | | | | merge: teach -Xours/-Xtheirs to symbolic link mergejc/merge-symlink-ours-theirsJunio C Hamano2018-01-032-4/+45
* | | | | | | Merge branch 'rs/lose-leak-pending'Junio C Hamano2018-01-2310-86/+46
|\ \ \ \ \ \ \
| * | | | | | | commit: remove unused function clear_commit_marks_for_object_array()rs/lose-leak-pendingRené Scharfe2017-12-282-15/+0
| * | | | | | | revision: remove the unused flag leak_pendingRené Scharfe2017-12-282-14/+1
| * | | | | | | checkout: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-12/+1
| * | | | | | | bundle: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-19/+16
| * | | | | | | bisect: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-21/+9
| * | | | | | | object: add clear_commit_marks_all()René Scharfe2017-12-282-0/+16
| * | | | | | | ref-filter: use clear_commit_marks_many() in do_merge_filter()René Scharfe2017-12-281-2/+1
| * | | | | | | commit: use clear_commit_marks_many() in remove_redundant()René Scharfe2017-12-281-2/+1
| * | | | | | | commit: avoid allocation in clear_commit_marks_many()René Scharfe2017-12-281-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jm/svn-pushmergeinfo-fix'Junio C Hamano2018-01-231-0/+1
|\ \ \ \ \ \ \
| * | | | | | | git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.jm/svn-pushmergeinfo-fixJason Merrill2017-09-171-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/ita-wt-renames-in-status'Junio C Hamano2018-01-236-44/+143
|\ \ \ \ \ \ \
| * | | | | | | wt-status.c: handle worktree renamesnd/ita-wt-renames-in-statusNguyễn Thái Ngọc Duy2017-12-273-13/+92
| * | | | | | | wt-status.c: rename rename-related fields in wt_status_change_dataNguyễn Thái Ngọc Duy2017-12-272-26/+29
| * | | | | | | wt-status.c: catch unhandled diff status codesNguyễn Thái Ngọc Duy2017-12-271-2/+6
| * | | | | | | wt-status.c: coding style fixNguyễn Thái Ngọc Duy2017-12-271-1/+2
| * | | | | | | Use DIFF_DETECT_RENAME for detect_rename assignmentsNguyễn Thái Ngọc Duy2017-12-273-4/+4
| * | | | | | | t2203: test status output with porcelain v2 formatNguyễn Thái Ngọc Duy2017-12-271-0/+12
* | | | | | | | Merge branch 'dk/describe-all-output-fix'Junio C Hamano2018-01-232-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | describe: prepend "tags/" when describing tags with embedded namedk/describe-all-output-fixDaniel Knittl-Frank2017-12-272-3/+10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Sync with v2.16.1Junio C Hamano2018-01-213-1/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 2.16.1v2.16.1Junio C Hamano2018-01-213-2/+13
View Lorry Controller Status