summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2018-11-18Merge branch 'ab/rebase-in-c-escape-hatch'Libravatar Junio C Hamano1-1/+4
2018-11-18Merge branch 'js/rebase-am-options'Libravatar Junio C Hamano1-63/+45
2018-11-18Merge branch 'cb/notes-freeing-always-null-fix'Libravatar Junio C Hamano1-3/+1
2018-11-18Merge branch 'js/rebase-r-and-merge-head'Libravatar Junio C Hamano1-0/+3
2018-11-18Merge branch 'js/builtin-rebase-perf-fix'Libravatar Junio C Hamano1-33/+46
2018-11-18Merge branch 'js/rebase-autostash-detach-fix'Libravatar Junio C Hamano1-1/+2
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Libravatar Junio C Hamano2-25/+16
2018-11-18Merge branch 'jk/unused-parameter-fixes'Libravatar Junio C Hamano22-16/+110
2018-11-18Merge branch 'nd/pthreads'Libravatar Junio C Hamano3-122/+46
2018-11-16tests: add a special setup where rebase.useBuiltin is offLibravatar Ævar Arnfjörð Bjarmason1-1/+4
2018-11-16rebase: validate -C<n> and --whitespace=<mode> parameters earlyLibravatar Johannes Schindelin1-1/+11
2018-11-16rebase: really just passthru the `git am` optionsLibravatar Johannes Schindelin1-63/+35
2018-11-13Merge branch 'bp/add-diff-files-optim'Libravatar Junio C Hamano1-5/+4
2018-11-13Merge branch 'jk/xdiff-interface'Libravatar Junio C Hamano2-2/+4
2018-11-13Merge branch 'nd/per-worktree-ref-iteration'Libravatar Junio C Hamano2-25/+89
2018-11-13Merge branch 'bp/refresh-index-using-preload'Libravatar Junio C Hamano3-3/+3
2018-11-13Merge branch 'pw/am-rebase-read-author-script'Libravatar Junio C Hamano1-56/+4
2018-11-13Merge branch 'jc/war-on-string-list'Libravatar Junio C Hamano1-46/+100
2018-11-13Merge branch 'ag/rev-parse-all-exclude-fix'Libravatar Junio C Hamano1-0/+1
2018-11-13Merge branch 'ao/submodule-wo-gitmodules-checked-out'Libravatar Junio C Hamano2-3/+54
2018-11-13Merge branch 'nb/worktree-api-doc'Libravatar Junio C Hamano1-5/+5
2018-11-13Merge branch 'ds/test-multi-pack-index'Libravatar Junio C Hamano1-2/+5
2018-11-13Merge branch 'nd/per-worktree-config'Libravatar Junio C Hamano1-1/+18
2018-11-13Merge branch 'jk/proto-v2-ref-prefix-fix'Libravatar Junio C Hamano1-8/+5
2018-11-13Merge branch 'jk/detect-truncated-zlib-input'Libravatar Junio C Hamano1-4/+12
2018-11-13Merge branch 'nd/config-split'Libravatar Junio C Hamano1-1/+14
2018-11-13built-in rebase: reinstate `checkout -q` behavior where appropriateLibravatar Johannes Schindelin1-15/+25
2018-11-13rebase: prepare reset_head() for more flagsLibravatar Johannes Schindelin1-3/+6
2018-11-13rebase: consolidate clean-up code before leaving reset_head()Libravatar Johannes Schindelin1-18/+18
2018-11-13built-in rebase --skip/--abort: clean up stale .git/<name> filesLibravatar Johannes Schindelin1-0/+3
2018-11-13builtin/notes: remove unnecessary freeLibravatar Carlo Marcelo Arenas Belón1-3/+1
2018-11-08built-in rebase --autostash: leave the current branch alone if possibleLibravatar Johannes Schindelin1-1/+2
2018-11-07pull: handle --verify-signatures for unborn branchLibravatar Jeff King1-0/+11
2018-11-07merge: handle --verify-signatures for unborn branchLibravatar Jeff King1-0/+4
2018-11-07merge: extract verify_merge_signature() helperLibravatar Jeff King1-25/+1
2018-11-06Merge branch 'md/exclude-promisor-objects-fix'Libravatar Junio C Hamano3-0/+3
2018-11-06Merge branch 'nd/submodule-unused-vars'Libravatar Junio C Hamano1-1/+1
2018-11-06Merge branch 'sb/submodule-url-to-absolute'Libravatar Junio C Hamano1-17/+34
2018-11-06Merge branch 'js/shallow-and-fetch-prune'Libravatar Junio C Hamano2-1/+7
2018-11-06Merge branch 'js/remote-archive-dwimfix'Libravatar Junio C Hamano2-0/+4
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksLibravatar Jeff King21-3/+92
2018-11-06cat-file: report an error on multiple --batch optionsLibravatar Jeff King1-1/+1
2018-11-06tag: mark "--message" option with NONEGLibravatar Jeff King1-2/+2
2018-11-06show-branch: mark --reflog option as NONEGLibravatar Jeff King1-1/+1
2018-11-06format-patch: mark "--no-numbered" option with NONEGLibravatar Jeff King1-1/+1
2018-11-06status: mark --find-renames option with NONEGLibravatar Jeff King1-1/+1
2018-11-06cat-file: mark batch options with NONEGLibravatar Jeff King1-2/+4
2018-11-06pack-objects: mark index-version option as NONEGLibravatar Jeff King1-1/+1
2018-11-06ls-files: mark exclude options as NONEGLibravatar Jeff King1-3/+4
2018-11-06am: handle --no-patch-format optionLibravatar Jeff King1-1/+3