summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-26use pop_commit() for consuming the first entry of a struct commit_listLibravatar René Scharfe10-92/+31
2015-10-26Correct fscanf formatting string for I64u valuesLibravatar Waldek Maleska2-1/+5
2015-10-26Silence GCC's "cast of pointer to integer of a different size" warningLibravatar Johannes Schindelin3-4/+6
2015-10-26Squelch warning about an integer overflowLibravatar Johannes Schindelin1-1/+1
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-24add: simplify -u/-A without pathspecLibravatar Junio C Hamano3-7/+4
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
2015-10-16usage: do not insist that standard input must come from a fileLibravatar Junio C Hamano25-41/+64
2015-10-16Git 2.6.2Libravatar Junio C Hamano4-3/+69
2015-10-16Merge branch 'cc/quote-comments' into maintLibravatar Junio C Hamano1-5/+6
2015-10-16Merge branch 'es/worktree-add-cleanup' into maintLibravatar Junio C Hamano1-0/+0
2015-10-16Merge branch 'tk/doc-interpret-trailers-grammo' into maintLibravatar Junio C Hamano1-1/+1
2015-10-16Merge branch 'tk/typofix-connect-unknown-proto-error' into maintLibravatar Junio C Hamano1-1/+1
2015-10-16Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maintLibravatar Junio C Hamano2-2/+2
2015-10-16Merge branch 'nd/ls-remote-does-not-have-u-option' into maintLibravatar Junio C Hamano2-3/+2
2015-10-16Merge branch 'jc/fsck-dropped-errors' into maintLibravatar Junio C Hamano2-5/+35
2015-10-16Merge branch 'sb/http-flaky-test-fix' into maintLibravatar Junio C Hamano3-23/+1
2015-10-16Merge branch 'sb/perf-without-installed-git' into maintLibravatar Junio C Hamano1-0/+1
2015-10-16Merge branch 'js/icase-wt-detection' into maintLibravatar Junio C Hamano1-1/+10
2015-10-16Merge branch 'pt/am-builtin' into maintLibravatar Junio C Hamano1-1/+12
2015-10-16Merge branch 'mm/detach-at-HEAD-reflog' into maintLibravatar Junio C Hamano2-0/+19
2015-10-16Merge branch 'gr/rebase-i-drop-warn' into maintLibravatar Junio C Hamano2-35/+46
2015-10-16Merge branch 'dt/log-follow-config' into maintLibravatar Junio C Hamano2-4/+10
2015-10-16Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maintLibravatar Junio C Hamano3-14/+34
2015-10-16Merge branch 'jk/notes-dwim-doc' into maintLibravatar Junio C Hamano3-3/+12
2015-10-16Merge branch 'jk/make-findstring-makeflags-fix' into maintLibravatar Junio C Hamano1-2/+2
2015-10-16Merge branch 'jw/make-arflags-customizable' into maintLibravatar Junio C Hamano1-3/+6
2015-10-16Merge branch 'jk/connect-clear-env' into maintLibravatar Junio C Hamano2-10/+49
2015-10-16Merge branch 'jk/blame-first-parent' into maintLibravatar Junio C Hamano2-1/+14
2015-10-16Merge branch 'mm/keyid-docs' into maintLibravatar Junio C Hamano10-29/+47