summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-10-17Merge branch 'jc/checkout-detach-doc'Libravatar Junio C Hamano1-6/+8
2013-10-17Sync with maintLibravatar Junio C Hamano2-21/+65
2013-10-17Start preparing for 1.8.4.2Libravatar Junio C Hamano2-1/+51
2013-10-17Merge branch 'jk/upload-pack-keepalive' into maintLibravatar Junio C Hamano2-1/+35
2013-10-17Merge branch 'bc/http-backend-allow-405' into maintLibravatar Junio C Hamano1-2/+4
2013-10-17Merge branch 'jc/cvsserver-perm-bit-fix' into maintLibravatar Junio C Hamano1-1/+1
2013-10-17Merge branch 'js/add-i-mingw' into maintLibravatar Junio C Hamano1-1/+1
2013-10-17Merge branch 'nd/git-dir-pointing-at-gitfile' into maintLibravatar Junio C Hamano2-5/+8
2013-10-17Merge branch 'jk/has-sha1-file-retry-packed' into maintLibravatar Junio C Hamano1-1/+4
2013-10-17Merge branch 'ap/commit-author-mailmap' into maintLibravatar Junio C Hamano2-1/+18
2013-10-17Merge branch 'es/rebase-i-no-abbrev' into maintLibravatar Junio C Hamano2-2/+117
2013-10-17Merge branch 'rt/rebase-p-no-merge-summary' into maintLibravatar Junio C Hamano2-1/+25
2013-10-17Merge branch 'es/rebase-i-respect-core-commentchar' into maintLibravatar Junio C Hamano1-1/+1
2013-10-17t4254: modernize testsLibravatar SZEDER Gábor1-21/+15
2013-10-16Update draft release notes to 1.8.5Libravatar Junio C Hamano1-0/+30
2013-10-16Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano3-25/+146
2013-10-15Merge branch 'maint'Libravatar Junio C Hamano3-2/+12
2013-10-15git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORYLibravatar Steffen Prohaska1-1/+1
2013-10-15git.txt: fix asciidoc syntax of --*-pathspecsLibravatar Steffen Prohaska1-3/+3
2013-10-14mergetool--lib: Fix typo in the merge/difftool helpLibravatar Stefan Saasen1-1/+1
2013-10-14sparse: suppress some "using sizeof on a function" warningsLibravatar Ramsay Jones1-0/+3
2013-10-14format-patch doc: Thunderbird wraps lines unless mailnews.wraplength=0Libravatar Ramsay Jones1-1/+2
2013-10-14Merge branch 'rj/highlight-test-hang'Libravatar Jonathan Nieder1-2/+4
2013-10-14gitweb test: fix highlight test hang on Linux MintLibravatar Ramsay Jones1-2/+4
2013-10-14wrapper.c: only define gitmkstemps if neededLibravatar Ramsay Jones1-0/+2
2013-10-14refs.c: spell NULL pointer as NULLLibravatar Ramsay Jones1-1/+1
2013-10-14config.c: mark file-local function staticLibravatar Ramsay Jones1-1/+1
2013-10-14CodingGuidelines: style for multi-line commentsLibravatar brian m. carlson1-0/+8
2013-10-14Merge branch 'nv/doc-config-signingkey'Libravatar Jonathan Nieder1-5/+5
2013-10-14config doc: user.signingkey is also used for signed commitsLibravatar Nicolas Vigier1-5/+5
2013-10-14clone --branch: refuse to clone if upstream repo is emptyLibravatar Ralf Thielow2-1/+11
2013-10-14Merge branch 'sb/checkout-test-complex-path'Libravatar Jonathan Nieder1-7/+7
2013-10-14Merge branch 'rt/cherry-pick-status'Libravatar Jonathan Nieder3-11/+17
2013-10-14Merge branch 'rj/doc-formatting-fix'Libravatar Jonathan Nieder2-6/+6
2013-10-14Merge branch 'po/remote-set-head-usage'Libravatar Jonathan Nieder2-5/+5
2013-10-14Merge branch 'nd/clone-local-with-colon'Libravatar Jonathan Nieder2-2/+46
2013-10-14Merge branch 'jx/clean-interactive'Libravatar Jonathan Nieder2-3/+3
2013-10-14Merge branch 'jk/diff-algo'Libravatar Jonathan Nieder1-2/+2
2013-10-14path-utils test: rename mingw_path function to print_pathLibravatar Sebastian Schuberth2-3/+3
2013-10-14howto/revert-a-faulty-merge: fix unescaped '^'sLibravatar Ramsay Jones1-4/+4
2013-10-14howto/setup-git-server-over-http: fix unescaped '^'sLibravatar Ramsay Jones1-2/+2
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolLibravatar Stefan Saasen3-2/+18
2013-10-13.mailmap: switch to Thomas Rast's personal addressLibravatar Thomas Rast1-1/+3
2013-10-12git-svn: Warn about changing default for --prefix in Git v2.0Libravatar Johan Herland3-2/+88
2013-10-12Documentation/git-svn: Promote the use of --prefix in docs + examplesLibravatar Johan Herland1-10/+25
2013-10-11status: show commit sha1 in "You are currently cherry-picking" messageLibravatar Ralf Thielow3-6/+12
2013-10-11status test: add missing && to <<EOF blocksLibravatar Jonathan Nieder1-5/+5
2013-10-10git-svn.txt: elaborate on rev_map filesLibravatar Keshav Kini1-4/+24
2013-10-10git-svn.txt: replace .git with $GIT_DIRLibravatar Keshav Kini1-8/+8
2013-10-10git-svn.txt: reword description of gc commandLibravatar Keshav Kini1-2/+2