summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* perf-lib: add test_perf_cleanup targettg/perf-lib-test-perf-cleanupThomas Gummerer2013-09-192-0/+36
* perf-lib: split starting the test from the executionThomas Gummerer2013-09-191-6/+9
* Merge branch 'jk/config-int-range-check'Junio C Hamano2013-09-191-0/+1
|\
| * compat/mingw.h: define PRId64jk/config-int-range-checkJohannes Sixt2013-09-191-0/+1
* | Merge branch 'maint'Junio C Hamano2013-09-181-0/+50
|\ \
| * | Start preparing for 1.8.4.1Junio C Hamano2013-09-182-1/+51
| * | Merge branch 'bc/completion-for-bash-3.0' into maintJunio C Hamano2013-09-183-3/+7
| |\ \
| * \ \ Merge branch 'mm/no-shell-escape-in-die-message' into maintJunio C Hamano2013-09-182-1/+14
| |\ \ \
| * \ \ \ Merge branch 'jl/some-submodule-config-are-not-boolean' into maintJunio C Hamano2013-09-182-0/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'tr/log-full-diff-keep-true-parents' into maintJunio C Hamano2013-09-188-3/+134
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maintJunio C Hamano2013-09-184-31/+134
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sp/clip-read-write-to-8mb' into maintJunio C Hamano2013-09-186-27/+26
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/mailmap-incomplete-line' into maintJunio C Hamano2013-09-182-13/+24
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Update draft release notes to 1.8.5 for the fourth batch of topicsJunio C Hamano2013-09-181-0/+31
* | | | | | | | | | Merge branch 'jc/url-match'Junio C Hamano2013-09-181-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | urlmatch.c: recompute pointer after append_normalized_escapesjc/url-matchThomas Rast2013-09-121-1/+5
* | | | | | | | | | | Merge branch 'jc/cvsserver-perm-bit-fix'Junio C Hamano2013-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cvsserver: pick up the right mode bitsjc/cvsserver-perm-bit-fixJunio C Hamano2013-09-111-1/+1
* | | | | | | | | | | | Merge branch 'bc/send-email-ssl-die-message-fix'Junio C Hamano2013-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | send-email: don't call methods on undefined valuesbc/send-email-ssl-die-message-fixBrian M. Carlson2013-09-101-1/+1
* | | | | | | | | | | | | Merge branch 'uh/git-svn-serf-fix'Junio C Hamano2013-09-181-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn: fix termination issues for remote svn connectionsuh/git-svn-serf-fixUli Heller2013-09-061-0/+8
* | | | | | | | | | | | | | Merge branch 'fc/contrib-bzr-hg-fixes'Junio C Hamano2013-09-186-292/+327
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | contrib/remote-helpers: quote variable references in redirection targetsfc/contrib-bzr-hg-fixesJunio C Hamano2013-09-031-20/+20
| * | | | | | | | | | | | | | contrib/remote-helpers: style updates for test scriptsJunio C Hamano2013-09-034-226/+248
| * | | | | | | | | | | | | | remote-hg: use notes to keep track of Hg revisionsFelipe Contreras2013-08-301-1/+34
| * | | | | | | | | | | | | | remote-helpers: cleanup more global variablesFelipe Contreras2013-08-292-57/+2
| * | | | | | | | | | | | | | remote-helpers: trivial style fixesFelipe Contreras2013-08-292-3/+3
| * | | | | | | | | | | | | | remote-hg: improve basic testFelipe Contreras2013-08-291-2/+2
| * | | | | | | | | | | | | | remote-hg: add missing &&s in the testFelipe Contreras2013-08-291-2/+2
| * | | | | | | | | | | | | | remote-hg: fix testFelipe Contreras2013-08-291-2/+0
| * | | | | | | | | | | | | | remote-bzr: make bzr branches configurable per-repoFelipe Contreras2013-08-291-3/+10
| * | | | | | | | | | | | | | remote-bzr: fix export of utf-8 authorsFelipe Contreras2013-08-292-0/+31
* | | | | | | | | | | | | | | Merge branch 'js/add-i-mingw'Junio C Hamano2013-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | add--interactive: fix external command invocation on Windowsjs/add-i-mingwJohannes Sixt2013-09-041-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ks/p4-view-spec'Junio C Hamano2013-09-182-165/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git p4: implement view spec wildcards with "p4 where"ks/p4-view-specKazuki Saitoh2013-09-031-164/+59
| * | | | | | | | | | | | | | | git p4 test: sanitize P4CHARSETkazuki saitoh2013-08-111-1/+2
* | | | | | | | | | | | | | | | Merge branch 'jk/duplicate-objects-in-packs'Junio C Hamano2013-09-185-3/+316
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t5308: check that index-pack --strict detects duplicate objectsJeff King2013-09-041-0/+7
| * | | | | | | | | | | | | | | | test index-pack on packs with recoverable delta cyclesJeff King2013-08-241-0/+18
| * | | | | | | | | | | | | | | | add tests for indexing packs with delta cyclesJeff King2013-08-242-0/+81
| * | | | | | | | | | | | | | | | sha1-lookup: handle duplicate keys with GIT_USE_LOOKUPJeff King2013-08-243-0/+198
| * | | | | | | | | | | | | | | | test-sha1: add a binary output modeJeff King2013-08-221-3/+12
* | | | | | | | | | | | | | | | | Merge branch 'nd/git-dir-pointing-at-gitfile'Junio C Hamano2013-09-182-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Make setup_git_env() resolve .git file when $GIT_DIR is not specifiednd/git-dir-pointing-at-gitfileNguyễn Thái Ngọc Duy2013-09-032-5/+8
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jk/pager-bypass-cat-for-default-pager'Junio C Hamano2013-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | pager: turn on "cat" optimization for DEFAULT_PAGERjk/pager-bypass-cat-for-default-pagerJeff King2013-09-031-1/+1
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'fc/t3200-fixes'Junio C Hamano2013-09-181-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t: branch: fix broken && chainsfc/t3200-fixesFelipe Contreras2013-09-031-4/+4