summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-08-23merge: save merge state earlierLibravatar Michael J Gruber2-0/+17
2017-08-23merge: split write_merge_state in twoLibravatar Michael J Gruber1-3/+8
2017-08-23merge: clarify call chainLibravatar Michael J Gruber1-0/+2
2017-08-21Documentation/git-merge: explain --continueLibravatar Michael J Gruber1-1/+4
2017-08-04Git 2.14.1Libravatar Junio C Hamano3-2/+6
2017-08-04Merge tag 'v2.13.5' into maintLibravatar Junio C Hamano14-2/+130
2017-08-04Git 2.14Libravatar Junio C Hamano2-13/+3
2017-08-04Merge branch 'ah/patch-id-doc'Libravatar Junio C Hamano1-3/+0
2017-08-04Merge branch 'as/diff-options-grammofix'Libravatar Junio C Hamano1-1/+1
2017-08-02Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano9-15801/+17022
2017-08-02l10n: zh_CN: review for git v2.14.0 l10nLibravatar Jiang Xin2-8/+10
2017-08-01Git 2.13.5Libravatar Junio C Hamano3-2/+6
2017-08-01Merge tag 'v2.12.4' into maintLibravatar Junio C Hamano13-2/+126
2017-08-01Sync with v2.13.4Libravatar Junio C Hamano0-0/+0
2017-08-01Git 2.13.4Libravatar Junio C Hamano1-1/+1
2017-08-01l10n: ko.po: Update Korean translationLibravatar Changwoo Ryu1-13/+56
2017-08-01l10n: zh_CN: for git v2.14.0 l10n round 2Libravatar Jiang Xin1-3165/+3147
2017-07-31Sync with maintLibravatar Junio C Hamano1-0/+18
2017-07-31Preparation for 2.13.4 continuesLibravatar Junio C Hamano1-0/+18
2017-07-31Merge branch 'ks/doc-fixes' into maintLibravatar Junio C Hamano2-10/+11
2017-07-31Merge branch 'jk/test-copy-bytes-fix' into maintLibravatar Junio C Hamano1-0/+1
2017-07-31Merge branch 'pw/unquote-path-in-git-pm' into maintLibravatar Junio C Hamano3-43/+61
2017-07-31Merge branch 'jk/gc-pre-detach-under-hook' into maintLibravatar Junio C Hamano2-0/+25
2017-07-31Merge branch 'jn/hooks-pre-rebase-sample-fix' into maintLibravatar Junio C Hamano1-3/+3
2017-07-31Merge branch 'rs/progress-overall-throughput-at-the-end' into maintLibravatar Junio C Hamano1-2/+6
2017-07-31Merge branch 'tb/push-to-cygwin-unc-path' into maintLibravatar Junio C Hamano5-0/+27
2017-07-31Merge branch 'rs/apply-avoid-over-reading' into maintLibravatar Junio C Hamano1-4/+2
2017-07-31Merge branch 'js/blame-lib'Libravatar Junio C Hamano1-2/+4
2017-07-31diff-options doc: grammar fixLibravatar Anthony Sottile1-1/+1
2017-07-30Git 2.12.4Libravatar Junio C Hamano3-2/+6
2017-07-30Merge tag 'v2.11.3' into maint-2.12Libravatar Junio C Hamano11-0/+116
2017-07-30Merge branch 'jk/lib-proto-disable-cleanup' into maint-2.12Libravatar Junio C Hamano1-2/+6
2017-07-30Git 2.11.3Libravatar Junio C Hamano3-2/+6
2017-07-30Merge tag 'v2.10.4' into maint-2.11Libravatar Junio C Hamano10-0/+112
2017-07-30Git 2.10.4Libravatar Junio C Hamano3-2/+6
2017-07-30Merge tag 'v2.9.5' into maint-2.10Libravatar Junio C Hamano9-0/+108
2017-07-30Git 2.9.5Libravatar Junio C Hamano3-2/+6
2017-07-30Merge tag 'v2.8.6' into maint-2.9Libravatar Junio C Hamano8-0/+104
2017-07-30Git 2.8.6Libravatar Junio C Hamano3-2/+6
2017-07-30Merge tag 'v2.7.6' into maint-2.8Libravatar Junio C Hamano7-0/+100
2017-07-30Git 2.7.6Libravatar Junio C Hamano3-2/+27
2017-07-30l10n: de.po: various fixes in German translationLibravatar Hartmut Henkel1-27/+25
2017-07-30Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruLibravatar Jiang Xin1-3027/+3137
2017-07-30l10n: ru.po: update Russian translationLibravatar Dimitriy Ryazantcev1-3027/+3137
2017-07-28Merge branch 'jk/ssh-funny-url' into maint-2.7Libravatar Junio C Hamano6-0/+75
2017-07-28connect: reject paths that look like command line optionsLibravatar Jeff King3-0/+40
2017-07-28connect: reject dashed arguments for proxy commandsLibravatar Jeff King2-0/+10
2017-07-28connect: factor out "looks like command line option" checkLibravatar Jeff King3-1/+14
2017-07-28t5813: add test for hostname starting with dashLibravatar Jeff King1-0/+9
2017-07-28connect: reject ssh hostname that begins with a dashLibravatar Junio C Hamano1-0/+3