summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* notes: rename to load_display_notes()Denton Liu2019-12-091-2/+2
* format-patch: teach format.notes config optionDenton Liu2019-05-171-1/+19
* Merge branch 'js/misc-doc-fixes'Junio C Hamano2019-05-091-30/+0
|\
| * Turn `git serve` into a test helperJohannes Schindelin2019-04-191-30/+0
* | Merge branch 'jt/clone-server-option'Junio C Hamano2019-05-091-0/+6
|\ \
| * | clone: send server options when using protocol v2Jonathan Tan2019-04-181-0/+6
| |/
* | Merge branch 'tb/unexpected'Junio C Hamano2019-05-091-1/+3
|\ \
| * | rev-list: let traversal die when --missing is not in useJeff King2019-04-101-1/+3
| |/
* | Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano2019-05-092-5/+6
|\ \
| * | refs.c: remove the_repo from read_ref_at()Nguyễn Thái Ngọc Duy2019-04-081-2/+4
| * | builtin rebase: use oideq()SZEDER Gábor2019-04-081-1/+1
| * | builtin rebase: use FREE_AND_NULLSZEDER Gábor2019-04-081-2/+1
* | | Merge branch 'cc/replace-graft-peel-tags'Junio C Hamano2019-05-091-7/+13
|\ \ \
| * | | replace: peel tag when passing a tag first to --graftChristian Couder2019-04-151-4/+7
| * | | replace: peel tag when passing a tag as parent to --graftChristian Couder2019-04-151-3/+6
| | |/ | |/|
* | | Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano2019-05-095-42/+80
|\ \ \
| * | | cherry-pick/revert: add scissors line on merge conflictDenton Liu2019-04-192-8/+9
| * | | merge: add scissors line on merge conflictDenton Liu2019-04-182-5/+31
| * | | merge: cleanup messages like commitDenton Liu2019-04-182-10/+43
| * | | parse-options.h: extract common --cleanup optionDenton Liu2019-04-182-3/+2
| * | | commit: extract cleanup_mode functions to sequencerDenton Liu2019-04-181-23/+2
* | | | Merge branch 'jk/pack-objects-reports-num-objects-to-trace2'Junio C Hamano2019-05-091-0/+2
|\ \ \ \
| * | | | pack-objects: write objects packed to trace2Jonathan Tan2019-04-121-0/+2
* | | | | Merge branch 'km/empty-repo-is-still-a-repo'Junio C Hamano2019-05-091-1/+2
|\ \ \ \ \
| * | | | | add: error appropriately on repository with no commitsKyle Meyer2019-04-101-1/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'dl/warn-tagging-a-tag'Junio C Hamano2019-05-091-6/+17
|\ \ \ \ \
| * | | | | tag: advise on nested tagsDenton Liu2019-04-121-2/+12
| * | | | | tag: fix formattingDenton Liu2019-04-051-4/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'en/merge-directory-renames'Junio C Hamano2019-05-092-2/+2
|\ \ \ \ \
| * | | | | Use 'unsigned short' for mode, like diff_filespec doesElijah Newren2019-04-082-2/+2
| |/ / / /
* | | | | Merge branch 'nd/submodule-foreach-quiet'Junio C Hamano2019-04-251-4/+4
|\ \ \ \ \
| * | | | | submodule foreach: fix "<command> --quiet" not being respectedNguyễn Thái Ngọc Duy2019-04-151-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'sg/blame-in-bare-start-at-head'Junio C Hamano2019-04-251-0/+13
|\ \ \ \ \
| * | | | | blame: default to HEAD in a bare repo when no start commit is givenSZEDER Gábor2019-04-081-0/+13
| |/ / / /
* | | | | Merge branch 'tg/ls-files-debug-format-fix'Junio C Hamano2019-04-251-5/+5
|\ \ \ \ \
| * | | | | ls-files: use correct format stringThomas Gummerer2019-04-081-5/+5
| |/ / / /
* | | | | Merge branch 'dl/submodule-set-branch'Junio C Hamano2019-04-251-5/+12
|\ \ \ \ \
| * | | | | submodule--helper: teach config subcommand --unsetDenton Liu2019-02-081-5/+12
* | | | | | Merge branch 'bc/hash-transition-16'Junio C Hamano2019-04-257-27/+39
|\ \ \ \ \ \
| * | | | | | builtin/difftool: use parse_oid_hexbrian m. carlson2019-04-011-6/+4
| * | | | | | builtin/get-tar-commit-id: make hash size independentbrian m. carlson2019-04-011-1/+2
| * | | | | | get-tar-commit-id: parse comment recordRene Scharfe2019-04-011-2/+11
| * | | | | | builtin/pull: make hash-size independentbrian m. carlson2019-04-011-5/+6
| * | | | | | builtin/am: make hash size independentbrian m. carlson2019-04-011-4/+5
| * | | | | | builtin/name-rev: make hash-size independentbrian m. carlson2019-04-011-6/+8
| * | | | | | object-store: rename and expand packed_git's sha1 memberbrian m. carlson2019-04-011-1/+1
| * | | | | | pack-bitmap: switch hash tables to use struct object_idbrian m. carlson2019-04-011-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sg/index-pack-progress'Junio C Hamano2019-04-251-1/+9
|\ \ \ \ \ \
| * | | | | | index-pack: show progress while checking objectsSZEDER Gábor2019-04-011-1/+9
| |/ / / / /
* | | | | | Merge branch 'ab/commit-graph-fixes'Junio C Hamano2019-04-251-4/+19
|\ \ \ \ \ \