summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-03-11The second batchLibravatar Junio C Hamano1-0/+22
2019-03-11Sync with maintLibravatar Junio C Hamano1-1/+1
2019-03-11Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano1-1/+1
2019-03-11Merge branch 'js/untravis-windows'Libravatar Junio C Hamano2-113/+0
2019-03-11Merge branch 'rd/gc-prune-doc-fix'Libravatar Junio C Hamano1-1/+1
2019-03-11Merge branch 'js/find-lib-h-with-ls-files-when-possible'Libravatar Junio C Hamano1-2/+3
2019-03-11Merge branch 'rj/hdr-check-gcrypt-fix'Libravatar Junio C Hamano1-1/+4
2019-03-11Merge branch 'jk/guard-bswap-header'Libravatar Junio C Hamano1-0/+5
2019-03-11Merge branch 'rd/attr.c-comment-typofix'Libravatar Junio C Hamano1-4/+4
2019-03-11Merge branch 'yb/utf-16le-bom-spellfix'Libravatar Junio C Hamano1-1/+1
2019-03-11mingw: allow building with an MSYS2 runtime v3.xLibravatar Johannes Schindelin1-1/+1
2019-03-08mingw: drop MakeMaker referenceLibravatar Johannes Schindelin1-1/+0
2019-03-07Start 2.22 cycleLibravatar Junio C Hamano3-2/+81
2019-03-07Merge branch 'jt/http-auth-proto-v2-fix'Libravatar Junio C Hamano4-207/+213
2019-03-07Merge branch 'jk/diff-no-index-initialize'Libravatar Junio C Hamano4-17/+21
2019-03-07Merge branch 'nd/no-more-check-racy'Libravatar Junio C Hamano1-28/+0
2019-03-07Merge branch 'rd/doc-hook-used-in-sample'Libravatar Junio C Hamano1-0/+4
2019-03-07Merge branch 'nd/diff-parseopt-2'Libravatar Junio C Hamano2-211/+319
2019-03-07Merge branch 'en/merge-options-doc'Libravatar Junio C Hamano1-3/+8
2019-03-07Merge branch 'nd/completion-more-parameters'Libravatar Junio C Hamano18-4/+126
2019-03-07Merge branch 'ab/receive-pack-use-after-free-fix'Libravatar Junio C Hamano1-8/+15
2019-03-07Merge branch 'dl/doc-submodule-wo-subcommand'Libravatar Junio C Hamano2-1/+6
2019-03-07Merge branch 'jk/unused-params'Libravatar Junio C Hamano8-59/+45
2019-03-07Merge branch 'jk/prune-optim'Libravatar Junio C Hamano4-20/+129
2019-03-07Merge branch 'jh/trace2'Libravatar Junio C Hamano67-23/+6629
2019-03-07Merge branch 'js/doc-symref-in-proto-v1'Libravatar Junio C Hamano1-0/+18
2019-03-07Merge branch 'nd/split-index-null-base-fix'Libravatar Junio C Hamano3-18/+39
2019-03-07Merge branch 'rj/prune-packed-excess-args'Libravatar Junio C Hamano1-0/+5
2019-03-07Merge branch 'jc/test-yes-doc'Libravatar Junio C Hamano2-1/+14
2019-03-07Merge branch 'en/combined-all-paths'Libravatar Junio C Hamano10-17/+212
2019-03-07Merge branch 'sc/pack-redundant'Libravatar Junio C Hamano2-140/+559
2019-03-07Merge branch 'du/branch-show-current'Libravatar Junio C Hamano3-3/+72
2019-03-07Merge branch 'dl/complete-submodule-absorbgitdirs'Libravatar Junio C Hamano1-1/+1
2019-03-07Merge branch 'wh/author-committer-ident-config'Libravatar Junio C Hamano10-24/+197
2019-03-07Merge branch 'aw/pretty-trailers'Libravatar Junio C Hamano7-135/+417
2019-03-07Merge branch 'nd/diff-parseopt'Libravatar Junio C Hamano10-158/+318
2019-03-07Merge branch 'tg/checkout-no-overlay'Libravatar Junio C Hamano14-58/+191
2019-03-07attr.c: ".gitattribute" -> ".gitattributes" (comments)Libravatar Robert P. J. Day1-4/+4
2019-03-07gitattributes.txt: fix typoLibravatar Yash Bhatambare1-1/+1
2019-03-07rebase--interactive: move transform_todo_file()Libravatar Alban Gruin3-25/+25
2019-03-07sequencer: use edit_todo_list() in complete_action()Libravatar Alban Gruin1-14/+7
2019-03-07rebase-interactive: rewrite edit_todo_list() to handle the initial editLibravatar Alban Gruin5-28/+57