summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sr/transport-helper-fix'Junio C Hamano2011-08-0115-187/+475
|\
| * transport-helper: die early on encountering deleted refsSverre Rabbelier2011-07-191-0/+4
| * transport-helper: implement marks location as capabilitySverre Rabbelier2011-07-192-42/+29
| * transport-helper: Use capname for refspec capability tooSverre Rabbelier2011-07-191-1/+1
| * transport-helper: change import semanticsSverre Rabbelier2011-07-193-2/+19
| * transport-helper: update ref status after push with exportSverre Rabbelier2011-07-194-2/+67
| * transport-helper: use the new done feature where possibleSverre Rabbelier2011-07-192-7/+4
| * transport-helper: check status code of finish_commandSverre Rabbelier2011-07-191-8/+15
| * transport-helper: factor out push_update_refs_statusSverre Rabbelier2011-07-191-69/+84
| * fast-export: support done featureSverre Rabbelier2011-07-192-0/+13
| * fast-import: introduce 'done' commandSverre Rabbelier2011-07-193-0/+75
| * git-remote-testgit: fix error handlingSverre Rabbelier2011-07-195-22/+62
| * git-remote-testgit: only push for non-local repositoriesSverre Rabbelier2011-07-191-1/+3
| * remote-curl: accept empty line as terminatorSverre Rabbelier2011-07-191-1/+9
| * remote-helpers: export GIT_DIR variable to helpersDmitry Ivankov2011-07-193-18/+14
| * git_remote_helpers: push all refs during a non-local exportJeff King2011-07-192-2/+2
| * transport-helper: don't feed bogus refs to export pushJeff King2011-07-192-2/+3
| * git-remote-testgit: import non-HEAD refsJeff King2011-07-193-4/+9
| * t5800: document some non-functional parts of remote helpersJeff King2011-07-191-0/+47
| * t5800: use skip_all instead of prereqSverre Rabbelier2011-07-191-15/+19
| * t5800: factor out some ref testsJeff King2011-07-191-4/+8
| * transport-helper: fix minor leak in push_refs_with_exportJeff King2011-07-191-0/+1
* | Merge branch 'jc/maint-reset-unmerged-path'Junio C Hamano2011-08-013-2/+18
|\ \
| * | reset [<commit>] paths...: do not mishandle unmerged pathsJunio C Hamano2011-07-133-2/+18
* | | Merge branch 'maint'Junio C Hamano2011-08-011-1/+1
|\ \ \
| * \ \ Merge branch 'nk/ref-doc' into maintJunio C Hamano2011-08-014-30/+34
| |\ \ \
| * \ \ \ Merge branch 'jl/maint-fetch-recursive-fix' into maintJunio C Hamano2011-08-012-8/+9
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maintJunio C Hamano2011-08-011-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/legacy-loose-object' into maintJunio C Hamano2011-08-011-29/+33
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'an/shallow-doc' into maintJunio C Hamano2011-08-011-29/+74
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-1.7.3-checkout-describe' into maintJunio C Hamano2011-08-014-1/+19
| |\ \ \ \ \ \ \ \
| * | | | | | | | | connect: correctly number ipv6 network adapterErik Faye-Lund2011-08-011-1/+1
* | | | | | | | | | git-p4: commit time should be most recent p4 change timePete Wyckoff2011-08-012-1/+33
* | | | | | | | | | git-p4: one test missing config git-p4.skipSubmitEditCheckPete Wyckoff2011-08-011-0/+1
* | | | | | | | | | git-p4: add missing && in testPete Wyckoff2011-08-011-1/+1
* | | | | | | | | | git-p4: use test_when_finished in testsPete Wyckoff2011-08-011-54/+49
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-07-313-6/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Break down no-lstat() condition checks in verify_uptodate()Nguyễn Thái Ngọc Duy2011-07-311-2/+13
| * | | | | | | | | t7400: fix bogus test failure with symlinked trashJeff King2011-07-311-2/+4
| * | | | | | | | | Documentation: clarify the invalidated tree entry formatCarlos Martín Nieto2011-07-311-2/+3
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-07-241-1/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | tests: print failed test numbers at the end of the test runJens Lehmann2011-07-241-1/+13
* | | | | | | | | | Update draft release notes to 1.7.7Junio C Hamano2011-07-221-1/+16
* | | | | | | | | | Merge branch 'dc/stash-con-untracked'Junio C Hamano2011-07-223-7/+228
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: Add --include-untracked option to stash and remove all untracked filesDavid Caldwell2011-06-263-6/+227
* | | | | | | | | | | Merge branch 'jk/tag-contains-ab'Junio C Hamano2011-07-221-1/+45
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert clock-skew based attempt to optimize tag --contains traversalJunio C Hamano2011-07-146-87/+3
| * | | | | | | | | | | git skew: a tool to find how big a clock skew exists in the historyJeff King2011-06-305-0/+54
| * | | | | | | | | | | default core.clockskew variable to one dayJeff King2011-06-111-1/+1
| * | | | | | | | | | | limit "contains" traversals based on commit timestampJeff King2011-06-111-3/+33