summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-09-06builtin rebase: start a new rebase only if none is in progressLibravatar Pratik Karki1-1/+47
2018-09-06builtin rebase: support --force-rebaseLibravatar Pratik Karki1-1/+21
2018-09-06builtin rebase: try to fast forward when possibleLibravatar Pratik Karki1-0/+72
2018-09-06builtin rebase: require a clean worktreeLibravatar Pratik Karki1-0/+11
2018-09-06builtin rebase: support the `verbose` and `diffstat` optionsLibravatar Pratik Karki1-2/+58
2018-09-06builtin rebase: support --quietLibravatar Pratik Karki1-0/+15
2018-09-06builtin rebase: handle the pre-rebase hook and --no-verifyLibravatar Pratik Karki1-0/+11
2018-09-06builtin rebase: support `git rebase --onto A...B`Libravatar Pratik Karki1-1/+7
2018-09-06builtin rebase: support --ontoLibravatar Pratik Karki1-5/+30
2018-08-06builtin/rebase: support running "git rebase <upstream>"Libravatar Pratik Karki1-1/+364
2018-08-06rebase: refactor common shell functions into their own fileLibravatar Pratik Karki4-67/+72
2018-08-06rebase: start implementing it as a builtinLibravatar Pratik Karki6-1/+68
2018-08-02Fifth batch for 2.19 cycleLibravatar Junio C Hamano1-0/+107
2018-08-02Merge branch 'jt/commit-graph-per-object-store'Libravatar Junio C Hamano16-62/+207
2018-08-02Merge branch 'es/chain-lint-in-subshell'Libravatar Junio C Hamano78-5/+1316
2018-08-02Merge branch 'jt/tags-to-promised-blobs-fix'Libravatar Junio C Hamano3-3/+57
2018-08-02Merge branch 'jt/fetch-negotiator-skipping'Libravatar Junio C Hamano8-4/+461
2018-08-02Merge branch 'jm/send-email-tls-auth-on-batch'Libravatar Junio C Hamano1-2/+1
2018-08-02Merge branch 'bc/sequencer-export-work-tree-as-well'Libravatar Junio C Hamano2-0/+11
2018-08-02Merge branch 'en/t7405-recursive-submodule-conflicts'Libravatar Junio C Hamano1-0/+173
2018-08-02Merge branch 'en/t6036-merge-recursive-tests'Libravatar Junio C Hamano1-0/+451
2018-08-02Merge branch 'en/dirty-merge-fixes'Libravatar Junio C Hamano9-179/+124
2018-08-02Merge branch 'js/rebase-merge-octopus'Libravatar Junio C Hamano5-47/+204
2018-08-02Merge branch 'tb/grep-only-matching'Libravatar Junio C Hamano5-34/+86
2018-08-02Merge branch 'kg/gc-auto-windows-workaround'Libravatar Junio C Hamano2-0/+3
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Libravatar Junio C Hamano16-134/+515
2018-08-02Merge branch 'jt/fetch-nego-tip'Libravatar Junio C Hamano8-2/+176
2018-08-02Merge branch 'en/t6042-insane-merge-rename-testcases'Libravatar Junio C Hamano1-0/+245
2018-08-02Merge branch 'sb/object-store-lookup'Libravatar Junio C Hamano82-361/+487
2018-08-02Merge branch 'is/parsing-line-range'Libravatar Junio C Hamano6-14/+17
2018-08-02Merge branch 'jt/fetch-pack-negotiator'Libravatar Junio C Hamano8-169/+373
2018-08-02Merge branch 'ab/checkout-default-remote'Libravatar Junio C Hamano11-16/+197
2018-08-02Merge branch 'sb/diff-color-move-more'Libravatar Junio C Hamano7-88/+489
2018-08-02Merge branch 'es/test-fixes'Libravatar Junio C Hamano104-590/+569
2018-08-02Merge branch 'ds/commit-graph-fsck'Libravatar Junio C Hamano14-83/+575
2018-08-02Merge branch 'jk/fsck-gitmodules-gently'Libravatar Junio C Hamano5-15/+56
2018-08-02Merge branch 'bc/object-id'Libravatar Junio C Hamano15-49/+56
2018-08-02Merge branch 'en/t6036-recursive-corner-cases'Libravatar Junio C Hamano1-55/+201
2018-08-02Merge branch 'sg/httpd-test-unflake'Libravatar Junio C Hamano4-36/+29
2018-08-02Merge branch 'bp/test-drop-caches-for-windows'Libravatar Junio C Hamano1-2/+2
2018-08-02Merge branch 'jk/has-uncommitted-changes-fix'Libravatar Junio C Hamano3-0/+25
2018-07-31t/chainlint.sed: drop extra spaces from regex character classLibravatar Eric Sunshine1-4/+4
2018-07-24Fourth batch for 2.19 cycleLibravatar Junio C Hamano1-0/+80
2018-07-24Merge branch 'as/sequencer-customizable-comment-char'Libravatar Junio C Hamano1-1/+1
2018-07-24Merge branch 'sb/blame-color'Libravatar Junio C Hamano1-1/+3
2018-07-24Merge branch 'nd/command-list'Libravatar Junio C Hamano1-2/+2
2018-07-24Merge branch 'es/test-lint-one-shot-export'Libravatar Junio C Hamano3-7/+32
2018-07-24Merge branch 'wc/find-commit-with-pattern-on-detached-head'Libravatar Junio C Hamano3-1/+29
2018-07-24Merge branch 'jc/t3404-one-shot-export-fix'Libravatar Junio C Hamano1-1/+8
2018-07-24Merge branch 'mk/merge-in-sparse-checkout'Libravatar Junio C Hamano2-1/+60