Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rebase: add --allow-empty-message option | Genki Sky | 2018-02-07 | 7 | -11/+53 |
* | First batch after 2.16 | Junio C Hamano | 2018-01-23 | 1 | -0/+65 |
* | Merge branch 'nd/add-i-ignore-submodules' | Junio C Hamano | 2018-01-23 | 2 | -1/+49 |
|\ | |||||
| * | add--interactive: ignore submodule changes except HEAD | Nguyễn Thái Ngọc Duy | 2018-01-16 | 2 | -1/+49 |
* | | Merge branch 'mm/send-email-fallback-to-local-mail-address' | Junio C Hamano | 2018-01-23 | 7 | -166/+321 |
|\ \ | |||||
| * | | send-email: add test for Linux's get_maintainer.pl | Alex Bennée | 2018-01-08 | 1 | -0/+19 |
| * | | perl/Git: remove now useless email-address parsing code | Matthieu Moy | 2018-01-08 | 3 | -165/+0 |
| * | | send-email: add and use a local copy of Mail::Address | Matthieu Moy | 2018-01-05 | 3 | -1/+302 |
* | | | Merge branch 'ab/doc-cat-file-e-still-shows-errors' | Junio C Hamano | 2018-01-23 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | cat-file doc: document that -e will return some output | Ævar Arnfjörð Bjarmason | 2018-01-11 | 1 | -3/+4 |
* | | | | Merge branch 'as/read-tree-prefix-doc-fix' | Junio C Hamano | 2018-01-23 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | doc/read-tree: remove obsolete remark | Andreas G. Schacker | 2018-01-09 | 1 | -3/+2 |
* | | | | | Merge branch 'ys/bisect-object-id-missing-conversion-fix' | Junio C Hamano | 2018-01-23 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | bisect: debug: convert struct object to object_id | Yasushi SHOJI | 2018-01-09 | 1 | -3/+3 |
* | | | | | | Merge branch 'tg/stash-with-pathspec-fix' | Junio C Hamano | 2018-01-23 | 2 | -3/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | stash: don't delete untracked files that match pathspec | Thomas Gummerer | 2018-01-08 | 2 | -3/+34 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/submodule-update-reset-fix' | Junio C Hamano | 2018-01-23 | 3 | -3/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule: submodule_move_head omits old argument in forced case | Stefan Beller | 2018-01-05 | 2 | -1/+17 |
| * | | | | | | unpack-trees: oneway_merge to update submodules | Stefan Beller | 2018-01-05 | 1 | -0/+3 |
| * | | | | | | t/lib-submodule-update.sh: fix test ignoring ignored files in submodules | Stefan Beller | 2018-01-05 | 1 | -0/+1 |
| * | | | | | | t/lib-submodule-update.sh: clarify test | Stefan Beller | 2018-01-05 | 1 | -2/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'bw/oidmap-autoinit' | Junio C Hamano | 2018-01-23 | 1 | -0/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | oidmap: ensure map is initialized | Brandon Williams | 2017-12-27 | 1 | -0/+11 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ab/commit-m-with-fixup' | Junio C Hamano | 2018-01-23 | 3 | -4/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: add support for --fixup <commit> -m"<extra message>" | Ævar Arnfjörð Bjarmason | 2017-12-22 | 3 | -6/+14 |
| * | | | | | | commit doc: document that -c, -C, -F and --fixup with -m error | Ævar Arnfjörð Bjarmason | 2017-12-22 | 1 | -0/+3 |
* | | | | | | | Merge branch 'cc/codespeed' | Junio C Hamano | 2018-01-23 | 2 | -54/+137 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | perf/run: read GIT_PERF_REPO_NAME from perf.repoName | Christian Couder | 2018-01-05 | 1 | -0/+3 |
| * | | | | | | | perf/run: learn to send output to codespeed server | Christian Couder | 2018-01-05 | 1 | -1/+11 |
| * | | | | | | | perf/run: learn about perf.codespeedOutput | Christian Couder | 2018-01-05 | 1 | -1/+6 |
| * | | | | | | | perf/run: add conf_opts argument to get_var_from_env_or_config() | Christian Couder | 2018-01-05 | 1 | -5/+6 |
| * | | | | | | | perf/aggregate: implement codespeed JSON output | Christian Couder | 2018-01-05 | 1 | -2/+62 |
| * | | | | | | | perf/aggregate: refactor printing results | Christian Couder | 2018-01-05 | 1 | -46/+50 |
| * | | | | | | | perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION} | Christian Couder | 2018-01-05 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ab/perf-grep-threads' | Junio C Hamano | 2018-01-23 | 2 | -21/+86 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | perf: amend the grep tests to test grep.threads | Ævar Arnfjörð Bjarmason | 2018-01-04 | 2 | -21/+86 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sb/diff-blobfind-pickaxe' | Junio C Hamano | 2018-01-23 | 8 | -40/+155 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: use HAS_MULTI_BITS instead of counting bits manually | Stefan Beller | 2018-01-05 | 1 | -10/+5 |
| * | | | | | | | | diff: properly error out when combining multiple pickaxe options | Stefan Beller | 2018-01-05 | 2 | -1/+3 |
| * | | | | | | | | diffcore: add a pickaxe option to find a specific blob | Stefan Beller | 2018-01-05 | 6 | -20/+135 |
| * | | | | | | | | diff: introduce DIFF_PICKAXE_KINDS_MASK | Stefan Beller | 2018-01-05 | 5 | -6/+8 |
| * | | | | | | | | diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit | Stefan Beller | 2018-01-05 | 3 | -5/+6 |
| * | | | | | | | | diff.h: make pickaxe_opts an unsigned bit field | Stefan Beller | 2018-01-05 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jk/abort-clone-with-existing-dest' | Junio C Hamano | 2018-01-23 | 2 | -33/+98 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clone: do not clean up directories we didn't create | Jeff King | 2018-01-03 | 2 | -9/+67 |
| * | | | | | | | | | clone: factor out dir_exists() helper | Jeff King | 2018-01-03 | 1 | -3/+8 |
| * | | | | | | | | | t5600: modernize style | Jeff King | 2018-01-03 | 1 | -23/+25 |
| * | | | | | | | | | t5600: fix outdated comment about unborn HEAD | Jeff King | 2018-01-03 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/merge-symlink-ours-theirs' | Junio C Hamano | 2018-01-23 | 2 | -4/+45 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | merge: teach -Xours/-Xtheirs to symbolic link merge | Junio C Hamano | 2018-01-03 | 2 | -4/+45 |