summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-01-05rebase -p: fix quoting when calling `git merge`Libravatar Johannes Schindelin2-3/+20
2017-12-06Prepare for 2.15.2Libravatar Junio C Hamano2-1/+48
2017-12-06Merge branch 'jc/merge-base-fork-point-doc' into maintLibravatar Junio C Hamano1-8/+56
2017-12-06Merge branch 'tz/redirect-fix' into maintLibravatar Junio C Hamano2-2/+2
2017-12-06Merge branch 'tz/notes-error-to-stderr' into maintLibravatar Junio C Hamano3-9/+9
2017-12-06Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maintLibravatar Junio C Hamano2-2/+39
2017-12-06Merge branch 'pw/sequencer-recover-from-unlockable-index' into maintLibravatar Junio C Hamano1-1/+2
2017-12-06Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintLibravatar Junio C Hamano2-0/+16
2017-12-06Merge branch 'tz/complete-branch-copy' into maintLibravatar Junio C Hamano1-1/+1
2017-12-06Merge branch 'ew/rebase-mboxrd' into maintLibravatar Junio C Hamano2-0/+24
2017-12-06Merge branch 'sd/branch-copy' into maintLibravatar Junio C Hamano1-2/+2
2017-12-06Merge branch 'sw/pull-ipv46-passthru' into maintLibravatar Junio C Hamano1-0/+12
2017-12-06Merge branch 'bc/submitting-patches-in-asciidoc' into maintLibravatar Junio C Hamano3-161/+192
2017-12-06Merge branch 'mh/avoid-rewriting-packed-refs' into maintLibravatar Junio C Hamano4-1/+238
2017-11-28Git 2.15.1Libravatar Junio C Hamano1-0/+3
2017-11-28Merge branch 'rs/config-write-section-fix' into maintLibravatar Junio C Hamano1-1/+1
2017-11-27A bit more fixes for 2.15.1Libravatar Junio C Hamano1-0/+5
2017-11-27Merge branch 'ma/reduce-heads-leakfix' into maintLibravatar Junio C Hamano7-23/+52
2017-11-27Merge branch 'ma/bisect-leakfix' into maintLibravatar Junio C Hamano3-19/+29
2017-11-27Merge branch 'rs/apply-fuzzy-match-fix' into maintLibravatar Junio C Hamano1-39/+20
2017-11-27Merge branch 'ad/submitting-patches-title-decoration' into maintLibravatar Junio C Hamano1-8/+13
2017-11-27Merge branch 'rs/imap-send-next-arg-fix' into maintLibravatar Junio C Hamano1-2/+13
2017-11-26RelNotes: minor typo fixes in 2.15.1 draftLibravatar Todd Zullinger1-3/+3
2017-11-21Almost ready for 2.15.1Libravatar Junio C Hamano1-0/+12
2017-11-21Merge branch 'rs/sequencer-rewrite-file-cleanup' into maintLibravatar Junio C Hamano1-29/+16
2017-11-21Merge branch 'cb/t4201-robustify' into maintLibravatar Junio C Hamano2-5/+7
2017-11-21Merge branch 'tz/fsf-address-update' into maintLibravatar Junio C Hamano44-103/+69
2017-11-21Merge branch 'ad/rebase-i-serie-typofix' into maintLibravatar Junio C Hamano1-1/+1
2017-11-21Merge branch 'jk/info-alternates-fix' into maintLibravatar Junio C Hamano1-1/+3
2017-11-21Merge branch 'ab/pcre-v2' into maintLibravatar Junio C Hamano2-3/+4
2017-11-21Merge branch 'sr/wrapper-quote-filenames' into maintLibravatar Junio C Hamano3-6/+6
2017-11-21Merge branch 'bw/rebase-i-ignored-submodule-fix' into maintLibravatar Junio C Hamano2-1/+20
2017-11-21pull: pass -4/-6 option to 'git fetch'Libravatar Shuyu Wei1-0/+12
2017-11-18config: flip return value of write_section()Libravatar René Scharfe1-1/+1
2017-11-18rebase: use mboxrd format to avoid split errorsLibravatar Eric Wong2-0/+24
2017-11-17apply: update line lengths for --inaccurate-eofLibravatar René Scharfe2-0/+16
2017-11-17completion: add '--copy' option to 'git branch'Libravatar Todd Zullinger1-1/+1
2017-11-16sequencer: reschedule pick if index can't be lockedLibravatar Phillip Wood1-1/+2
2017-11-16config: avoid "write_in_full(fd, buf, len) != len" patternLibravatar Phillip Wood1-2/+2
2017-11-15merge-recursive: handle addition of submodule on our side of historyLibravatar Elijah Newren2-3/+4
2017-11-15Start preparation for 2.15.1Libravatar Junio C Hamano3-2/+70
2017-11-15Merge branch 'ks/mailmap' into maintLibravatar Junio C Hamano1-0/+1
2017-11-15Merge branch 'jm/relnotes-2.15-typofix' into maintLibravatar Junio C Hamano1-3/+3
2017-11-15Merge branch 'cn/diff-indent-no-longer-is-experimental' into maintLibravatar Junio C Hamano4-9/+6
2017-11-15Merge branch 'js/mingw-redirect-std-handles' into maintLibravatar Junio C Hamano3-0/+88
2017-11-15Merge branch 'js/wincred-empty-cred' into maintLibravatar Junio C Hamano2-2/+27
2017-11-15Merge branch 'js/mingw-full-version-in-resources' into maintLibravatar Junio C Hamano2-3/+4
2017-11-15Merge branch 'dk/libsecret-unlock-to-load-fix' into maintLibravatar Junio C Hamano1-1/+1
2017-11-15Merge branch 'js/early-config' into maintLibravatar Junio C Hamano1-1/+3
2017-11-15Merge branch 'ad/5580-unc-tests-on-cygwin' into maintLibravatar Junio C Hamano1-4/+10