Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | 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 | |
* | | | | | | | | | | Merge branch 'rs/lose-leak-pending' | Junio C Hamano | 2018-01-23 | 10 | -86/+46 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | commit: remove unused function clear_commit_marks_for_object_array() | René Scharfe | 2017-12-28 | 2 | -15/+0 | |
| * | | | | | | | | | | revision: remove the unused flag leak_pending | René Scharfe | 2017-12-28 | 2 | -14/+1 | |
| * | | | | | | | | | | checkout: avoid using the rev_info flag leak_pending | René Scharfe | 2017-12-28 | 1 | -12/+1 | |
| * | | | | | | | | | | bundle: avoid using the rev_info flag leak_pending | René Scharfe | 2017-12-28 | 1 | -19/+16 | |
| * | | | | | | | | | | bisect: avoid using the rev_info flag leak_pending | René Scharfe | 2017-12-28 | 1 | -21/+9 | |
| * | | | | | | | | | | object: add clear_commit_marks_all() | René Scharfe | 2017-12-28 | 2 | -0/+16 | |
| * | | | | | | | | | | ref-filter: use clear_commit_marks_many() in do_merge_filter() | René Scharfe | 2017-12-28 | 1 | -2/+1 | |
| * | | | | | | | | | | commit: use clear_commit_marks_many() in remove_redundant() | René Scharfe | 2017-12-28 | 1 | -2/+1 | |
| * | | | | | | | | | | commit: avoid allocation in clear_commit_marks_many() | René Scharfe | 2017-12-28 | 1 | -1/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jm/svn-pushmergeinfo-fix' | Junio C Hamano | 2018-01-23 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames. | Jason Merrill | 2017-09-17 | 1 | -0/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'nd/ita-wt-renames-in-status' | Junio C Hamano | 2018-01-23 | 6 | -44/+143 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | wt-status.c: handle worktree renames | Nguyễn Thái Ngọc Duy | 2017-12-27 | 3 | -13/+92 | |
| * | | | | | | | | | | wt-status.c: rename rename-related fields in wt_status_change_data | Nguyễn Thái Ngọc Duy | 2017-12-27 | 2 | -26/+29 | |
| * | | | | | | | | | | wt-status.c: catch unhandled diff status codes | Nguyễn Thái Ngọc Duy | 2017-12-27 | 1 | -2/+6 | |
| * | | | | | | | | | | wt-status.c: coding style fix | Nguyễn Thái Ngọc Duy | 2017-12-27 | 1 | -1/+2 | |
| * | | | | | | | | | | Use DIFF_DETECT_RENAME for detect_rename assignments | Nguyễn Thái Ngọc Duy | 2017-12-27 | 3 | -4/+4 | |
| * | | | | | | | | | | t2203: test status output with porcelain v2 format | Nguyễn Thái Ngọc Duy | 2017-12-27 | 1 | -0/+12 | |
* | | | | | | | | | | | Merge branch 'dk/describe-all-output-fix' | Junio C Hamano | 2018-01-23 | 2 | -3/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ |