summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-11-13Merge branch 'nd/wildmatch-double-asterisk'Libravatar Junio C Hamano4-6/+6
2018-11-13Merge branch 'nd/per-worktree-config'Libravatar Junio C Hamano12-78/+255
2018-11-13Merge branch 'jk/stream-pack-non-delta-clarification'Libravatar Junio C Hamano1-0/+9
2018-11-13Merge branch 'jk/proto-v2-ref-prefix-fix'Libravatar Junio C Hamano2-8/+23
2018-11-13Merge branch 'jk/detect-truncated-zlib-input'Libravatar Junio C Hamano3-7/+35
2018-11-13Merge branch 'nd/config-split'Libravatar Junio C Hamano88-2894/+2980
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-13refs: fix some exclude patterns being ignoredLibravatar Rafael Ascensão2-12/+16
2018-11-13refs: show --exclude failure with --branches/tags/remotes=globLibravatar Rafael Ascensão1-3/+57
2018-11-13apply --recount: allow "no-op hunks"Libravatar Johannes Schindelin2-1/+13
2018-11-13status: rebase and merge can be in progress at the same timeLibravatar Johannes Schindelin1-2/+7
2018-11-13built-in rebase --skip/--abort: clean up stale .git/<name> filesLibravatar Johannes Schindelin1-0/+3
2018-11-13rebase -i: include MERGE_HEAD into files to clean upLibravatar Johannes Schindelin1-0/+2
2018-11-13rebase -r: do not write MERGE_HEAD unless neededLibravatar Johannes Schindelin2-5/+5
2018-11-13rebase -r: demonstrate bug with conflicting mergesLibravatar Johannes Schindelin1-0/+16
2018-11-13builtin/notes: remove unnecessary freeLibravatar Carlo Marcelo Arenas Belón1-3/+1
2018-11-12p3400: replace calls to `git checkout -b' by `git checkout -B'Libravatar Alban Gruin1-5/+5
2018-11-12build: fix broken command-list.h generation with core.autocrlfLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12Update .mailmapLibravatar Johannes Schindelin1-0/+13
2018-11-12range-diff: fix regression in passing along diff optionsLibravatar Ævar Arnfjörð Bjarmason2-1/+54
2018-11-12range-diff doc: add a section about output stabilityLibravatar Ævar Arnfjörð Bjarmason1-0/+17
2018-11-08built-in rebase --autostash: leave the current branch alone if possibleLibravatar Johannes Schindelin2-2/+3
2018-11-08built-in rebase: demonstrate regression with --autostashLibravatar Johannes Schindelin1-0/+8
2018-11-07Windows: force-recompile git.res for differing architecturesLibravatar Johannes Schindelin1-1/+1
2018-11-07approxidate: fix NULL dereference in date_time()Libravatar Jeff King2-1/+2
2018-11-07pull: handle --verify-signatures for unborn branchLibravatar Jeff King2-0/+18
2018-11-07merge: handle --verify-signatures for unborn branchLibravatar Jeff King2-0/+11
2018-11-07merge: extract verify_merge_signature() helperLibravatar Jeff King3-25/+34
2018-11-06Ninth batch for 2.20Libravatar Junio C Hamano1-2/+57
2018-11-06Merge branch 'sg/test-verbose-log'Libravatar Junio C Hamano2-2/+3
2018-11-06Merge branch 'rj/header-cleanup'Libravatar Junio C Hamano3-3/+6
2018-11-06Merge branch 'ss/travis-ci-force-vm-mode'Libravatar Junio C Hamano1-2/+0
2018-11-06Merge branch 'sg/test-rebase-editor-fix'Libravatar Junio C Hamano2-7/+7
2018-11-06Merge branch 'tb/char-may-be-unsigned'Libravatar Junio C Hamano1-1/+1
2018-11-06Merge branch 'js/mingw-ns-filetime'Libravatar Junio C Hamano3-38/+76
2018-11-06Merge branch 'md/exclude-promisor-objects-fix'Libravatar Junio C Hamano8-2/+15
2018-11-06Merge branch 'jw/send-email-no-auth'Libravatar Junio C Hamano2-3/+12
2018-11-06Merge branch 'nd/submodule-unused-vars'Libravatar Junio C Hamano4-31/+38
2018-11-06Merge branch 'nd/unpack-trees-with-cache-tree'Libravatar Junio C Hamano1-1/+1
2018-11-06Merge branch 'nd/completion-negation'Libravatar Junio C Hamano1-1/+1
2018-11-06Merge branch 'jt/upload-pack-v2-fix-shallow'Libravatar Junio C Hamano2-63/+115
2018-11-06Merge branch 'sb/submodule-url-to-absolute'Libravatar Junio C Hamano2-17/+58
2018-11-06Merge branch 'js/shallow-and-fetch-prune'Libravatar Junio C Hamano5-8/+54
2018-11-06Merge branch 'js/remote-archive-dwimfix'Libravatar Junio C Hamano6-4/+23
2018-11-06completion: use __gitcomp_builtin for format-patchLibravatar Duy Nguyen2-10/+14
2018-11-06midx: double-check large object write loopLibravatar Jeff King1-3/+9
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksLibravatar Jeff King26-3/+134
2018-11-06parse-options: drop OPT_DATE()Libravatar Jeff King5-38/+0