summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/status-without-comment-char'Junio C Hamano2013-09-2011-852/+967
|\
| * t7508: avoid non-portable sed expressionmm/status-without-comment-charEric Sunshine2013-09-171-1/+2
| * status: add missing blank line after list of "other" filesMatthieu Moy2013-09-062-1/+24
| * tests: don't set status.displayCommentPrefix file-wideMatthieu Moy2013-09-063-813/+793
| * status: disable display of '#' comment prefix by defaultMatthieu Moy2013-09-068-17/+114
| * submodule summary: ignore --for-status optionMatthieu Moy2013-09-063-20/+32
| * wt-status: use argv_array APIMatthieu Moy2013-09-061-12/+14
| * builtin/stripspace.c: fix broken indentationMatthieu Moy2013-09-061-4/+4
* | Merge branch 'rh/peeling-tag-to-tag'Junio C Hamano2013-09-203-3/+15
|\ \
| * | peel_onion: do not assume length of x_type globalsrh/peeling-tag-to-tagJeff King2013-09-031-4/+4
| * | peel_onion(): add support for <rev>^{tag}Richard Hansen2013-09-033-0/+12
| |/
* | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-09-204-48/+175
|\ \
| * | status: always show tracking branch even no changeJiang Xin2013-08-263-9/+42
| * | branch: report invalid tracking branch as goneJiang Xin2013-08-264-48/+142
* | | Merge branch 'nd/fetch-into-shallow'Junio C Hamano2013-09-2012-160/+152
|\ \ \
| * | | Add testcase for needless objects during a shallow fetchnd/fetch-into-shallowMatthijs Kooijman2013-08-281-0/+11
| * | | list-objects: mark more commits as edges in mark_edges_uninterestingNguyễn Thái Ngọc Duy2013-08-281-0/+17
| * | | list-objects: reduce one argument in mark_edges_uninterestingNguyễn Thái Ngọc Duy2013-08-286-9/+8
| * | | upload-pack: delegate rev walking in shallow fetch to pack-objectsNguyễn Thái Ngọc Duy2013-08-282-99/+32
| * | | shallow: add setup_temporary_shallow()Nguyễn Thái Ngọc Duy2013-08-282-0/+24
| * | | shallow: only add shallow graft points to new shallow fileNguyễn Thái Ngọc Duy2013-08-281-0/+2
| * | | move setup_alternate_shallow and write_shallow_commits to shallow.cNguyễn Thái Ngọc Duy2013-08-183-52/+58
* | | | 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
View Lorry Controller Status