Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | notes: rename to load_display_notes() | Denton Liu | 2019-12-09 | 1 | -2/+2 |
* | format-patch: teach format.notes config option | Denton Liu | 2019-05-17 | 1 | -1/+19 |
* | Merge branch 'js/misc-doc-fixes' | Junio C Hamano | 2019-05-09 | 1 | -30/+0 |
|\ | |||||
| * | Turn `git serve` into a test helper | Johannes Schindelin | 2019-04-19 | 1 | -30/+0 |
* | | Merge branch 'jt/clone-server-option' | Junio C Hamano | 2019-05-09 | 1 | -0/+6 |
|\ \ | |||||
| * | | clone: send server options when using protocol v2 | Jonathan Tan | 2019-04-18 | 1 | -0/+6 |
| |/ | |||||
* | | Merge branch 'tb/unexpected' | Junio C Hamano | 2019-05-09 | 1 | -1/+3 |
|\ \ | |||||
| * | | rev-list: let traversal die when --missing is not in use | Jeff King | 2019-04-10 | 1 | -1/+3 |
| |/ | |||||
* | | Merge branch 'nd/sha1-name-c-wo-the-repository' | Junio C Hamano | 2019-05-09 | 2 | -5/+6 |
|\ \ | |||||
| * | | refs.c: remove the_repo from read_ref_at() | Nguyễn Thái Ngọc Duy | 2019-04-08 | 1 | -2/+4 |
| * | | builtin rebase: use oideq() | SZEDER Gábor | 2019-04-08 | 1 | -1/+1 |
| * | | builtin rebase: use FREE_AND_NULL | SZEDER Gábor | 2019-04-08 | 1 | -2/+1 |
* | | | Merge branch 'cc/replace-graft-peel-tags' | Junio C Hamano | 2019-05-09 | 1 | -7/+13 |
|\ \ \ | |||||
| * | | | replace: peel tag when passing a tag first to --graft | Christian Couder | 2019-04-15 | 1 | -4/+7 |
| * | | | replace: peel tag when passing a tag as parent to --graft | Christian Couder | 2019-04-15 | 1 | -3/+6 |
| | |/ | |/| | |||||
* | | | Merge branch 'dl/merge-cleanup-scissors-fix' | Junio C Hamano | 2019-05-09 | 5 | -42/+80 |
|\ \ \ | |||||
| * | | | cherry-pick/revert: add scissors line on merge conflict | Denton Liu | 2019-04-19 | 2 | -8/+9 |
| * | | | merge: add scissors line on merge conflict | Denton Liu | 2019-04-18 | 2 | -5/+31 |
| * | | | merge: cleanup messages like commit | Denton Liu | 2019-04-18 | 2 | -10/+43 |
| * | | | parse-options.h: extract common --cleanup option | Denton Liu | 2019-04-18 | 2 | -3/+2 |
| * | | | commit: extract cleanup_mode functions to sequencer | Denton Liu | 2019-04-18 | 1 | -23/+2 |
* | | | | Merge branch 'jk/pack-objects-reports-num-objects-to-trace2' | Junio C Hamano | 2019-05-09 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | pack-objects: write objects packed to trace2 | Jonathan Tan | 2019-04-12 | 1 | -0/+2 |
* | | | | | Merge branch 'km/empty-repo-is-still-a-repo' | Junio C Hamano | 2019-05-09 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | add: error appropriately on repository with no commits | Kyle Meyer | 2019-04-10 | 1 | -1/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dl/warn-tagging-a-tag' | Junio C Hamano | 2019-05-09 | 1 | -6/+17 |
|\ \ \ \ \ | |||||
| * | | | | | tag: advise on nested tags | Denton Liu | 2019-04-12 | 1 | -2/+12 |
| * | | | | | tag: fix formatting | Denton Liu | 2019-04-05 | 1 | -4/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'en/merge-directory-renames' | Junio C Hamano | 2019-05-09 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Use 'unsigned short' for mode, like diff_filespec does | Elijah Newren | 2019-04-08 | 2 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'nd/submodule-foreach-quiet' | Junio C Hamano | 2019-04-25 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | submodule foreach: fix "<command> --quiet" not being respected | Nguyễn Thái Ngọc Duy | 2019-04-15 | 1 | -4/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'sg/blame-in-bare-start-at-head' | Junio C Hamano | 2019-04-25 | 1 | -0/+13 |
|\ \ \ \ \ | |||||
| * | | | | | blame: default to HEAD in a bare repo when no start commit is given | SZEDER Gábor | 2019-04-08 | 1 | -0/+13 |
| |/ / / / | |||||
* | | | | | Merge branch 'tg/ls-files-debug-format-fix' | Junio C Hamano | 2019-04-25 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | ls-files: use correct format string | Thomas Gummerer | 2019-04-08 | 1 | -5/+5 |
| |/ / / / | |||||
* | | | | | Merge branch 'dl/submodule-set-branch' | Junio C Hamano | 2019-04-25 | 1 | -5/+12 |
|\ \ \ \ \ | |||||
| * | | | | | submodule--helper: teach config subcommand --unset | Denton Liu | 2019-02-08 | 1 | -5/+12 |
* | | | | | | Merge branch 'bc/hash-transition-16' | Junio C Hamano | 2019-04-25 | 7 | -27/+39 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/difftool: use parse_oid_hex | brian m. carlson | 2019-04-01 | 1 | -6/+4 |
| * | | | | | | builtin/get-tar-commit-id: make hash size independent | brian m. carlson | 2019-04-01 | 1 | -1/+2 |
| * | | | | | | get-tar-commit-id: parse comment record | Rene Scharfe | 2019-04-01 | 1 | -2/+11 |
| * | | | | | | builtin/pull: make hash-size independent | brian m. carlson | 2019-04-01 | 1 | -5/+6 |
| * | | | | | | builtin/am: make hash size independent | brian m. carlson | 2019-04-01 | 1 | -4/+5 |
| * | | | | | | builtin/name-rev: make hash-size independent | brian m. carlson | 2019-04-01 | 1 | -6/+8 |
| * | | | | | | object-store: rename and expand packed_git's sha1 member | brian m. carlson | 2019-04-01 | 1 | -1/+1 |
| * | | | | | | pack-bitmap: switch hash tables to use struct object_id | brian m. carlson | 2019-04-01 | 1 | -3/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sg/index-pack-progress' | Junio C Hamano | 2019-04-25 | 1 | -1/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | index-pack: show progress while checking objects | SZEDER Gábor | 2019-04-01 | 1 | -1/+9 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ab/commit-graph-fixes' | Junio C Hamano | 2019-04-25 | 1 | -4/+19 |
|\ \ \ \ \ \ |