summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-04-25Merge branch 'js/difftool-no-index'Libravatar Junio C Hamano7-9/+29
2019-04-25Merge branch 'pw/cherry-pick-continue'Libravatar Junio C Hamano2-13/+64
2019-04-25Merge branch 'nd/commit-a-with-paths-msg-update'Libravatar Junio C Hamano1-1/+2
2019-04-25Merge branch 'jk/server-info-rabbit-hole'Libravatar Junio C Hamano11-111/+173
2019-04-25Merge branch 'nd/diff-parseopt-4'Libravatar Junio C Hamano9-239/+219
2019-04-25Merge branch 'jk/unused-params-even-more'Libravatar Junio C Hamano24-67/+61
2019-04-25Merge branch 'sg/test-atexit'Libravatar Junio C Hamano68-247/+136
2019-04-25Merge branch 'ag/sequencer-reduce-rewriting-todo'Libravatar Junio C Hamano5-482/+553
2019-04-25Merge branch 'bp/post-index-change-hook'Libravatar Junio C Hamano7-3/+182
2019-04-25t7610: add mergetool --gui testsLibravatar Denton Liu1-0/+22
2019-04-25t7610: unsuppress outputLibravatar Denton Liu1-61/+61
2019-04-24t/perf: depend on perl JSON only when using --codespeedLibravatar Jeff King1-2/+2
2019-04-23doc/ls-files: put nested list for "-t" option into blockLibravatar Jeff King1-0/+2
2019-04-23p5302: create the repo in each index-pack testLibravatar Jeff King1-13/+18
2019-04-22Makefile: dedup list of files obtained from ls-filesLibravatar Junio C Hamano1-2/+2
2019-04-22The sixth batchLibravatar Junio C Hamano1-2/+24
2019-04-22Merge branch 'da/smerge'Libravatar Junio C Hamano3-1/+15
2019-04-22Merge branch 'dl/flex-str-cocci'Libravatar Junio C Hamano2-1/+14
2019-04-22Merge branch 'js/spell-out-options-in-tests'Libravatar Junio C Hamano12-43/+75
2019-04-22Merge branch 'nd/read-tree-reset-doc'Libravatar Junio C Hamano1-2/+3
2019-04-22Merge branch 'nd/interpret-trailers-docfix'Libravatar Junio C Hamano1-1/+1
2019-04-22Merge branch 'sg/asciidoctor-in-ci'Libravatar Junio C Hamano5-36/+46
2019-04-22Merge branch 'tz/asciidoctor-fixes'Libravatar Junio C Hamano2-15/+19
2019-04-22Merge branch 'js/check-docs-exe'Libravatar Junio C Hamano8-41/+10
2019-04-22Merge branch 'nd/include-if-wildmatch'Libravatar Junio C Hamano2-1/+14
2019-04-22Merge branch 'cb/doco-mono'Libravatar Junio C Hamano18-67/+70
2019-04-22Merge branch 'tg/stash-in-c-show-default-to-p-fix'Libravatar Junio C Hamano2-0/+22
2019-04-22Merge branch 'js/stash-in-c-pathspec-fix'Libravatar Junio C Hamano3-35/+50
2019-04-22Merge branch 'tb/stash-in-c-unused-param-fix'Libravatar Junio C Hamano1-4/+4
2019-04-22Merge branch 'ps/stash-in-c'Libravatar Junio C Hamano16-72/+2017
2019-04-21clone: do faster object check for partial clonesLibravatar Josh Steadmon3-2/+29
2019-04-21worktree: update is_bare heuristicsLibravatar Jonathan Tan2-4/+34
2019-04-19rebase -i: run without forking rebase--interactiveLibravatar Phillip Wood1-135/+86
2019-04-19rebase: use a common action enumLibravatar Phillip Wood1-43/+48
2019-04-19rebase -i: use struct rebase_options in do_interactive_rebase()Libravatar Phillip Wood1-33/+36
2019-04-19rebase -i: use struct rebase_options to parse argsLibravatar Phillip Wood1-91/+112
2019-04-19rebase -i: use struct object_id for squash_ontoLibravatar Phillip Wood3-8/+33
2019-04-19rebase -i: use struct commit when parsing optionsLibravatar Phillip Wood5-30/+55
2019-04-19rebase -i: remove duplicationLibravatar Phillip Wood1-3/+2
2019-04-19rebase -i: combine rebase--interactive.c with rebase.cLibravatar Phillip Wood3-378/+367
2019-04-19rebase: use OPT_RERERE_AUTOUPDATE()Libravatar Phillip Wood1-17/+13
2019-04-19rebase: rename write_basic_state()Libravatar Phillip Wood1-2/+2
2019-04-19rebase: don't translate trace stringsLibravatar Phillip Wood1-8/+7
2019-04-19sequencer: always discard index after checkoutLibravatar Phillip Wood3-12/+20
2019-04-19Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalLibravatar Junio C Hamano5-482/+553
2019-04-19untracked-cache: simplify parsing by dropping "len"Libravatar Jeff King1-8/+5
2019-04-19untracked-cache: simplify parsing by dropping "next"Libravatar Jeff King1-13/+7
2019-04-19untracked-cache: be defensive about missing NULs in indexLibravatar Jeff King1-7/+11
2019-04-19t5304: add a test for pruning with bitmapsLibravatar Jeff King1-0/+8
2019-04-19Turn `git serve` into a test helperLibravatar Johannes Schindelin9-30/+36