summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2019-07-31rebase -r: support merge strategies other than `recursive`Libravatar Johannes Schindelin1-9/+0
2019-07-31rebase: fold git-rebase--common into the -p backendLibravatar Johannes Schindelin1-2/+1
2019-07-31Drop unused git-rebase--am.shLibravatar Johannes Schindelin1-4/+0
2019-07-25git: mark cmd_rebase as requiring a worktreeLibravatar Johannes Schindelin1-4/+0
2019-07-25rebase: fix white-spaceLibravatar Johannes Schindelin1-1/+1
2019-05-30Merge branch 'js/rebase-config-bitfix'Libravatar Junio C Hamano1-1/+1
2019-05-28rebase: replace incorrect logical negation by correct bitwise oneLibravatar Johannes Schindelin1-1/+1
2019-05-19Merge branch 'js/difftool-no-index'Libravatar Junio C Hamano1-1/+2
2019-05-19Merge branch 'ds/midx-too-many-packs'Libravatar Junio C Hamano2-2/+2
2019-05-19Merge branch 'en/unicode-in-refnames'Libravatar Junio C Hamano2-0/+5
2019-05-19Merge branch 'dl/difftool-mergetool'Libravatar Junio C Hamano1-8/+5
2019-05-19Merge branch 'nd/parse-options-aliases'Libravatar Junio C Hamano1-4/+1
2019-05-19Merge branch 'nd/submodule-helper-incomplete-line-fix'Libravatar Junio C Hamano1-1/+1
2019-05-19Merge branch 'dl/warn-tagging-a-tag'Libravatar Junio C Hamano1-1/+1
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Libravatar Junio C Hamano1-2/+1
2019-05-13Merge branch 'pw/rebase-i-internal'Libravatar Junio C Hamano2-490/+465
2019-05-13Merge branch 'ew/repack-with-bitmaps-by-default'Libravatar Junio C Hamano2-2/+5
2019-05-13Merge branch 'js/partial-clone-connectivity-check'Libravatar Junio C Hamano1-2/+4
2019-05-13difftool: fallback on merge.guitoolLibravatar Denton Liu1-8/+2
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveLibravatar Denton Liu1-0/+3
2019-05-09difftool --no-index: error out on --dir-diff (and don't crash)Libravatar Johannes Schindelin1-1/+2
2019-05-09tag: fix typo in nested tagging hintLibravatar Denton Liu1-1/+1
2019-05-09Merge branch 'js/misc-doc-fixes'Libravatar Junio C Hamano1-30/+0
2019-05-09Merge branch 'jt/clone-server-option'Libravatar Junio C Hamano1-0/+6
2019-05-09Merge branch 'tb/unexpected'Libravatar Junio C Hamano1-1/+3
2019-05-09Merge branch 'nd/sha1-name-c-wo-the-repository'Libravatar Junio C Hamano2-5/+6
2019-05-09Merge branch 'cc/replace-graft-peel-tags'Libravatar Junio C Hamano1-7/+13
2019-05-09Merge branch 'dl/merge-cleanup-scissors-fix'Libravatar Junio C Hamano5-42/+80
2019-05-09Merge branch 'jk/pack-objects-reports-num-objects-to-trace2'Libravatar Junio C Hamano1-0/+2
2019-05-09Merge branch 'km/empty-repo-is-still-a-repo'Libravatar Junio C Hamano1-1/+2
2019-05-09Merge branch 'dl/warn-tagging-a-tag'Libravatar Junio C Hamano1-6/+17
2019-05-09Merge branch 'en/merge-directory-renames'Libravatar Junio C Hamano2-2/+2
2019-05-08submodule--helper: add a missing \nLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-05-07midx: pass a repository pointerLibravatar Derrick Stolee2-2/+2
2019-05-07parse-options: don't emit "ambiguous option" for aliasesLibravatar Nguyễn Thái Ngọc Duy1-4/+1
2019-04-26Honor core.precomposeUnicode in more placesLibravatar Elijah Newren2-0/+5
2019-04-25Merge branch 'nd/submodule-foreach-quiet'Libravatar Junio C Hamano1-4/+4
2019-04-25Merge branch 'sg/blame-in-bare-start-at-head'Libravatar Junio C Hamano1-0/+13
2019-04-25Merge branch 'tg/ls-files-debug-format-fix'Libravatar Junio C Hamano1-5/+5
2019-04-25Merge branch 'dl/submodule-set-branch'Libravatar Junio C Hamano1-5/+12
2019-04-25Merge branch 'bc/hash-transition-16'Libravatar Junio C Hamano7-27/+39
2019-04-25Merge branch 'sg/index-pack-progress'Libravatar Junio C Hamano1-1/+9
2019-04-25Merge branch 'ab/commit-graph-fixes'Libravatar Junio C Hamano1-4/+19
2019-04-25Merge branch 'ab/gc-reflog'Libravatar Junio C Hamano1-8/+29
2019-04-25Merge branch 'nd/checkout-m'Libravatar Junio C Hamano2-2/+10
2019-04-25Merge branch 'js/difftool-no-index'Libravatar Junio C Hamano1-4/+10
2019-04-25Merge branch 'nd/commit-a-with-paths-msg-update'Libravatar Junio C Hamano1-1/+2
2019-04-25Merge branch 'nd/diff-parseopt-4'Libravatar Junio C Hamano3-41/+11
2019-04-25Merge branch 'jk/unused-params-even-more'Libravatar Junio C Hamano12-28/+23
2019-04-25Merge branch 'ag/sequencer-reduce-rewriting-todo'Libravatar Junio C Hamano1-21/+123