summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lc/filter-branch-too-many-refs'Junio C Hamano2013-10-171-2/+2
|\
| * Allow git-filter-branch to process large repositories with lots of branches.lc/filter-branch-too-many-refsLee Carver2013-09-121-2/+2
* | Merge branch 'jc/checkout-detach-doc'Junio C Hamano2013-10-171-6/+8
|\ \
| * | checkout: update synopsys and documentation on detaching HEADjc/checkout-detach-docJunio C Hamano2013-09-111-6/+8
| |/
* | Sync with maintJunio C Hamano2013-10-172-21/+65
|\ \
| * | Start preparing for 1.8.4.2Junio C Hamano2013-10-172-1/+51
| * | Merge branch 'jk/upload-pack-keepalive' into maintJunio C Hamano2013-10-172-1/+35
| |\ \
| * \ \ Merge branch 'bc/http-backend-allow-405' into maintJunio C Hamano2013-10-171-2/+4
| |\ \ \
| * \ \ \ Merge branch 'jc/cvsserver-perm-bit-fix' into maintJunio C Hamano2013-10-171-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/add-i-mingw' into maintJunio C Hamano2013-10-171-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/git-dir-pointing-at-gitfile' into maintJunio C Hamano2013-10-172-5/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/has-sha1-file-retry-packed' into maintJunio C Hamano2013-10-171-1/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-172-1/+18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'es/rebase-i-no-abbrev' into maintJunio C Hamano2013-10-172-2/+117
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rt/rebase-p-no-merge-summary' into maintJunio C Hamano2013-10-172-1/+25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'es/rebase-i-respect-core-commentchar' into maintJunio C Hamano2013-10-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t4254: modernize testsSZEDER Gábor2013-10-171-21/+15
* | | | | | | | | | | | | Update draft release notes to 1.8.5Junio C Hamano2013-10-161-0/+30
* | | | | | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2013-10-163-25/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn: Warn about changing default for --prefix in Git v2.0Johan Herland2013-10-123-2/+88
| * | | | | | | | | | | | | Documentation/git-svn: Promote the use of --prefix in docs + examplesJohan Herland2013-10-121-10/+25
| * | | | | | | | | | | | | git-svn.txt: elaborate on rev_map filesKeshav Kini2013-10-101-4/+24
| * | | | | | | | | | | | | git-svn.txt: replace .git with $GIT_DIRKeshav Kini2013-10-101-8/+8
| * | | | | | | | | | | | | git-svn.txt: reword description of gc commandKeshav Kini2013-10-101-2/+2
| * | | | | | | | | | | | | git-svn.txt: fix AsciiDoc formatting errorKeshav Kini2013-10-101-1/+1
| * | | | | | | | | | | | | git-svn: fix signed commit parsingNicolas Vigier2013-10-101-1/+1
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-10-153-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORYSteffen Prohaska2013-10-151-1/+1
| * | | | | | | | | | | | | clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2013-10-142-1/+11
* | | | | | | | | | | | | | git.txt: fix asciidoc syntax of --*-pathspecsSteffen Prohaska2013-10-151-3/+3
* | | | | | | | | | | | | | mergetool--lib: Fix typo in the merge/difftool helpStefan Saasen2013-10-141-1/+1
* | | | | | | | | | | | | | sparse: suppress some "using sizeof on a function" warningsRamsay Jones2013-10-141-0/+3
* | | | | | | | | | | | | | format-patch doc: Thunderbird wraps lines unless mailnews.wraplength=0Ramsay Jones2013-10-141-1/+2
* | | | | | | | | | | | | | Merge branch 'rj/highlight-test-hang'Jonathan Nieder2013-10-141-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gitweb test: fix highlight test hang on Linux Mintrj/highlight-test-hangRamsay Jones2013-10-141-2/+4
* | | | | | | | | | | | | | | wrapper.c: only define gitmkstemps if neededRamsay Jones2013-10-141-0/+2
* | | | | | | | | | | | | | | refs.c: spell NULL pointer as NULLRamsay Jones2013-10-141-1/+1
* | | | | | | | | | | | | | | config.c: mark file-local function staticRamsay Jones2013-10-141-1/+1
* | | | | | | | | | | | | | | CodingGuidelines: style for multi-line commentsbrian m. carlson2013-10-141-0/+8
* | | | | | | | | | | | | | | Merge branch 'nv/doc-config-signingkey'Jonathan Nieder2013-10-141-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config doc: user.signingkey is also used for signed commitsnv/doc-config-signingkeyNicolas Vigier2013-10-141-5/+5
* | | | | | | | | | | | | | | | Merge branch 'sb/checkout-test-complex-path'Jonathan Nieder2013-10-141-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | checkout test: enable test with complex relative pathsb/checkout-test-complex-pathStefan Beller2013-10-091-7/+7
* | | | | | | | | | | | | | | | | Merge branch 'rt/cherry-pick-status'Jonathan Nieder2013-10-143-11/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | status: show commit sha1 in "You are currently cherry-picking" messagert/cherry-pick-statusRalf Thielow2013-10-113-6/+12
| * | | | | | | | | | | | | | | | | status test: add missing && to <<EOF blocksJonathan Nieder2013-10-111-5/+5
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'rj/doc-formatting-fix'Jonathan Nieder2013-10-142-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | howto/revert-a-faulty-merge: fix unescaped '^'srj/doc-formatting-fixRamsay Jones2013-10-141-4/+4
| * | | | | | | | | | | | | | | | | howto/setup-git-server-over-http: fix unescaped '^'sRamsay Jones2013-10-141-2/+2
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'po/remote-set-head-usage'Jonathan Nieder2013-10-142-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \