summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-11-05Merge branch 'jk/delete-modechange-conflict' into maintLibravatar Junio C Hamano5-89/+144
2015-11-05Merge branch 'js/imap-send-curl-compilation-fix' into maintLibravatar Junio C Hamano1-0/+4
2015-11-05Merge branch 'rp/link-curl-before-ssl' into maintLibravatar Junio C Hamano2-6/+34
2015-11-05Merge branch 'nd/clone-linked-checkout' into maintLibravatar Junio C Hamano4-8/+66
2015-11-05Merge branch 'sa/send-email-smtp-batch-data-limit' into maintLibravatar Junio C Hamano1-1/+5
2015-11-04Merge branch 'xf/user-manual-ff' into maintLibravatar Junio C Hamano1-5/+5
2015-11-04Merge branch 'xf/user-manual-markup' into maintLibravatar Junio C Hamano11-11/+11
2015-11-04Merge branch 'jc/everyday-markup' into maintLibravatar Junio C Hamano1-1/+1
2015-11-04Merge branch 'jc/em-dash-in-doc' into maintLibravatar Junio C Hamano6-6/+6
2015-11-04Merge branch 'es/worktree-add' into maintLibravatar Junio C Hamano1-1/+1
2015-11-03Merge branch 'mk/blame-error-message' into maintLibravatar Junio C Hamano1-1/+1
2015-11-03Merge branch 'jk/merge-file-exit-code' into maintLibravatar Junio C Hamano3-1/+38
2015-11-03Merge branch 'dt/name-hash-dir-entry-fix' into maintLibravatar Junio C Hamano4-60/+35
2015-11-03Merge branch 'jc/am-3-fallback-regression-fix' into maintLibravatar Junio C Hamano1-16/+33
2015-11-03Merge branch 'jc/usage-stdin' into maintLibravatar Junio C Hamano25-41/+64
2015-11-03Merge branch 'rt/placeholder-in-usage' into maintLibravatar Junio C Hamano2-3/+3
2015-11-03Merge branch 'dt/t7063-fix-flaky-test' into maintLibravatar Junio C Hamano1-1/+3
2015-11-03Merge branch 'mk/submodule-gitdir-path' into maintLibravatar Junio C Hamano5-17/+42
2015-11-03Merge branch 'nd/gc-auto-background-fix' into maintLibravatar Junio C Hamano1-1/+55
2015-11-03Merge branch 'ls/p4-translation-failure' into maintLibravatar Junio C Hamano2-11/+66
2015-11-03Merge branch 'gr/rebase-i-drop-warn' into maintLibravatar Junio C Hamano2-0/+24
2015-11-03Merge branch 'js/clone-dissociate' into maintLibravatar Junio C Hamano4-23/+62
2015-11-03Merge branch 'ld/p4-import-labels' into maintLibravatar Junio C Hamano2-8/+62
2015-11-03Merge branch 'tk/stripspace' into maintLibravatar Junio C Hamano9-103/+118
2015-11-03Merge branch 'jk/repository-extension' into maintLibravatar Junio C Hamano8-12/+209
2015-10-29merge-file: clamp exit code to maximum 127Libravatar Jeff King3-1/+38
2015-10-28rebase-i: work around Windows CRLF line endingsLibravatar Junio C Hamano2-1/+13
2015-10-28t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsLibravatar Johannes Schindelin1-0/+12
2015-10-26merge: detect delete/modechange conflictLibravatar Jeff King3-2/+37
2015-10-26t6031: generalize for recursive and resolve strategiesLibravatar Jeff King2-56/+77
2015-10-26t6031: move triple-rename test to t3030Libravatar Jeff King2-31/+30
2015-10-26imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availableLibravatar Johannes Schindelin1-0/+4
2015-10-26blame: fix option name in error messageLibravatar Max Kirillov1-1/+1
2015-10-26user-manual: fix the description of fast-forwardLibravatar Xue Fuqiao1-5/+5
2015-10-22Documentation: AsciiDoc spells em-dash as double-dashes, not tripleLibravatar Junio C Hamano6-6/+6
2015-10-22Documentation: match undefline with the text in old release notesLibravatar Junio C Hamano5-5/+5
2015-10-22Documentation: match underline with the textLibravatar Junio C Hamano5-5/+5
2015-10-22Documentation/everyday: match undefline with the textLibravatar Junio C Hamano1-1/+1
2015-10-22Documentation: fix header markupLibravatar Xue Fuqiao1-1/+1
2015-10-21name-hash: don't reuse cache_entry in dir_entryLibravatar David Turner4-60/+35
2015-10-21configure.ac: detect ssl need with libcurlLibravatar Remi Pommarel1-0/+10
2015-10-21Makefile: make curl-config path configurableLibravatar Remi Pommarel2-2/+19
2015-10-21Makefile: link libcurl before zlibLibravatar Remi Pommarel1-4/+5
2015-10-20Merge branch 'js/gc-with-stale-symref' into maintLibravatar Junio C Hamano2-1/+20
2015-10-20Merge branch 'rd/test-path-utils' into maintLibravatar Junio C Hamano2-2/+5
2015-10-20Merge branch 'jc/doc-gc-prune-now' into maintLibravatar Junio C Hamano1-2/+5
2015-10-20Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintLibravatar Junio C Hamano2-1/+15
2015-10-19t7063: fix flaky untracked-cache testLibravatar David Turner1-1/+3
2015-10-18Merge branch 'maint' of git://github.com/git-l10n/git-po into maintLibravatar Junio C Hamano1-1583/+1967
2015-10-18worktree: usage: denote <branch> as optional with 'add'Libravatar Sidhant Sharma1-1/+1