summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-svn: teach git-svn to populate svn:mergeinfoBryan Jacobs2011-09-134-0/+742
* Git 1.7.7-rc1v1.7.7-rc1Junio C Hamano2011-09-121-1/+1
* Sync with 1.7.6.3Junio C Hamano2011-09-124-7/+19
|\
| * Git 1.7.6.3v1.7.6.3Junio C Hamano2011-09-123-2/+7
| * Merge branch 'jl/maint-fetch-submodule-check-fix' into maintJunio C Hamano2011-09-122-6/+13
| |\
| | * fetch: skip on-demand checking when no submodules are configuredJens Lehmann2011-09-092-6/+13
* | | Merge branch 'jn/remote-helpers-doc'Junio C Hamano2011-09-123-31/+195
|\ \ \
| * | | (short) documentation for the testgit remote helperMatthieu Moy2011-09-013-0/+45
| * | | Documentation/git-remote-helpers: explain how import works with multiple refsMatthieu Moy2011-09-011-1/+21
| * | | Documentation/remote-helpers: explain capabilities firstJonathan Nieder2011-08-291-30/+129
* | | | Merge branch 'maint'Junio C Hamano2011-09-112-2/+21
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare for 1.7.6.3 maintenance releaseJunio C Hamano2011-09-112-1/+21
| * | | Merge branch 'ms/reflog-show-is-default' into maintJunio C Hamano2011-09-111-2/+1
| |\ \ \
| * \ \ \ Merge branch 'jk/reset-reflog-message-fix' into maintJunio C Hamano2011-09-112-37/+20
| |\ \ \ \
| * \ \ \ \ Merge branch 'vi/make-test-vector-less-specific' into maintJunio C Hamano2011-09-118-13/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/tag-contains-ab' (early part) into maintJunio C Hamano2011-09-111-1/+45
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dz/connect-error-report' into maintJunio C Hamano2011-09-111-14/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-mergetool-read-fix' into maintJunio C Hamano2011-09-111-4/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/maint-config-param' into maintJunio C Hamano2011-09-114-11/+47
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jn/doc-dashdash' into maintJunio C Hamano2011-09-119-13/+13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-1.7.2-status-ignored' into maintJunio C Hamano2011-09-113-2/+128
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | SubmittingPathces: remove Cogito referenceSverre Rabbelier2011-09-111-2/+1
* | | | | | | | | | | | | RelNotes/1.7.7: minor fixesMichael J Gruber2011-09-071-26/+26
* | | | | | | | | | | | | Minor update to how-to maintain gitJunio C Hamano2011-09-071-7/+6
* | | | | | | | | | | | | Update draft release notes to 1.7.7Junio C Hamano2011-09-061-1/+6
* | | | | | | | | | | | | Merge branch 'rc/histogram-diff'Junio C Hamano2011-09-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()Tay Ray Chuan2011-08-311-0/+2
* | | | | | | | | | | | | | Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-09-061-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t3005: do not assume a particular order of stdout and stderr of git-ls-filesJohannes Sixt2011-08-281-10/+12
* | | | | | | | | | | | | | | Merge branch 'mh/check-ref-format-print-normalize'Junio C Hamano2011-09-063-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Forbid DEL characters in reference namesMichael Haggerty2011-08-272-1/+4
| * | | | | | | | | | | | | | | check-ref-format --print: Normalize refnames that start with slashesMichael Haggerty2011-08-252-3/+9
* | | | | | | | | | | | | | | | Sync with 1.7.6.2Junio C Hamano2011-09-068-41/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Git 1.7.6.2v1.7.6.2Junio C Hamano2011-09-064-4/+13
| * | | | | | | | | | | | | | | Revert "Merge branch 'cb/maint-quiet-push' into maint"Junio C Hamano2011-09-066-39/+10
* | | | | | | | | | | | | | | | Update draft release notes to 1.7.7Junio C Hamano2011-09-021-2/+10
* | | | | | | | | | | | | | | | Merge branch 'js/i18n-scripts-2'Junio C Hamano2011-09-021-35/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | bisect: take advantage of gettextln, eval_gettextln.Jon Seymour2011-08-301-35/+14
* | | | | | | | | | | | | | | | | Merge branch 'tr/maint-t3903-misquoted-command'Junio C Hamano2011-09-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t3903: fix misquoted rev-parse invocationThomas Rast2011-08-301-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'bc/bisect-test-use-shell-path'Junio C Hamano2011-09-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare shBrandon Casey2011-08-301-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'va/p4-branch-import-test-update'Junio C Hamano2011-09-021-11/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-p4: simple branch tests editsPete Wyckoff2011-08-291-11/+8
* | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-strbuf-grow-nul-termination'Junio C Hamano2011-09-021-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | strbuf_grow(): maintain nul-termination even for new bufferThomas Rast2011-08-291-4/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-ident-to-git-memmove'Junio C Hamano2011-09-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Use memmove in ident_to_gitThomas Rast2011-08-291-2/+2
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-format-patch-empty-output'Junio C Hamano2011-09-022-4/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Document negated forms of format-patch --to --cc --add-headersThomas Rast2011-08-291-1/+8
View Lorry Controller Status