summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* blame: tighten command line parserjc/blame-missing-pathJunio C Hamano2018-02-071-6/+14
* First batch after 2.16Junio C Hamano2018-01-231-0/+65
* Merge branch 'nd/add-i-ignore-submodules'Junio C Hamano2018-01-232-1/+49
|\
| * add--interactive: ignore submodule changes except HEADnd/add-i-ignore-submodulesNguyễn Thái Ngọc Duy2018-01-162-1/+49
* | Merge branch 'mm/send-email-fallback-to-local-mail-address'Junio C Hamano2018-01-237-166/+321
|\ \
| * | send-email: add test for Linux's get_maintainer.plmm/send-email-fallback-to-local-mail-addressAlex Bennée2018-01-081-0/+19
| * | perl/Git: remove now useless email-address parsing codeMatthieu Moy2018-01-083-165/+0
| * | send-email: add and use a local copy of Mail::AddressMatthieu Moy2018-01-053-1/+302
* | | Merge branch 'ab/doc-cat-file-e-still-shows-errors'Junio C Hamano2018-01-231-3/+4
|\ \ \
| * | | cat-file doc: document that -e will return some outputab/doc-cat-file-e-still-shows-errorsÆvar Arnfjörð Bjarmason2018-01-101-3/+4
* | | | Merge branch 'as/read-tree-prefix-doc-fix'Junio C Hamano2018-01-231-3/+2
|\ \ \ \
| * | | | doc/read-tree: remove obsolete remarkas/read-tree-prefix-doc-fixAndreas G. Schacker2018-01-091-3/+2
* | | | | Merge branch 'ys/bisect-object-id-missing-conversion-fix'Junio C Hamano2018-01-231-3/+3
|\ \ \ \ \
| * | | | | bisect: debug: convert struct object to object_idYasushi SHOJI2018-01-091-3/+3
* | | | | | Merge branch 'tg/stash-with-pathspec-fix'Junio C Hamano2018-01-232-3/+34
|\ \ \ \ \ \
| * | | | | | stash: don't delete untracked files that match pathspectg/stash-with-pathspec-fixThomas Gummerer2018-01-082-3/+34
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sb/submodule-update-reset-fix'Junio C Hamano2018-01-233-3/+23
|\ \ \ \ \ \
| * | | | | | submodule: submodule_move_head omits old argument in forced casesb/submodule-update-reset-fixStefan Beller2018-01-052-1/+17
| * | | | | | unpack-trees: oneway_merge to update submodulesStefan Beller2018-01-051-0/+3
| * | | | | | t/lib-submodule-update.sh: fix test ignoring ignored files in submodulesStefan Beller2018-01-051-0/+1
| * | | | | | t/lib-submodule-update.sh: clarify testStefan Beller2018-01-051-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bw/oidmap-autoinit'Junio C Hamano2018-01-231-0/+11
|\ \ \ \ \ \
| * | | | | | oidmap: ensure map is initializedbw/oidmap-autoinitBrandon Williams2017-12-271-0/+11
| | |/ / / / | |/| | | |
* | | | | | 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
View Lorry Controller Status