summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/i18n-scripts-basic'Junio C Hamano2011-06-171-1/+0
|\
| * sh-i18n--envsubst.c: do not #include getopt.hBrandon Casey2011-06-171-1/+0
* | Git 1.7.6-rc2v1.7.6-rc2Junio C Hamano2011-06-162-2/+2
* | gitweb: do not misparse nonnumeric content tag files that contain a digitJonathan Nieder2011-06-092-1/+9
* | Git 1.7.6-rc1v1.7.6-rc1Junio C Hamano2011-06-082-3/+11
* | Merge branch 'maint'Junio C Hamano2011-06-081-2/+4
|\ \
| * | fetch: do not leak a refspecJim Meyering2011-06-081-2/+4
* | | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-06-071-6/+6
|\ \ \
| * | | t3703: skip more tests using colons in file names on WindowsAlex Riesen2011-06-071-6/+6
* | | | Merge branch 'jn/mime-type-with-params'Junio C Hamano2011-06-061-1/+1
|\ \ \ \
| * | | | gitweb: Fix usability of $prevent_xssJakub Narebski2011-06-051-1/+1
* | | | | Merge branch 'jn/gitweb-docs'Junio C Hamano2011-06-062-131/+135
|\ \ \ \ \
| * | | | | gitweb: Move "Requirements" up in gitweb/INSTALLJakub Narebski2011-06-031-15/+15
| * | | | | gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALLJakub Narebski2011-06-021-6/+13
| * | | | | gitweb: Move information about installation from README to INSTALLJakub Narebski2011-06-022-116/+113
* | | | | | Merge branch 'jk/diff-not-so-quick'Junio C Hamano2011-06-065-5/+16
|\ \ \ \ \ \
| * | | | | | diff: futureproof "stop feeding the backend early" logicJunio C Hamano2011-05-314-6/+11
| * | | | | | diff_tree: disable QUICK optimization with diff filterJeff King2011-05-312-0/+6
* | | | | | | Merge branch 'bc/maint-status-z-to-use-porcelain'Junio C Hamano2011-06-062-3/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | builtin/commit.c: set status_format _after_ option parsingBrandon Casey2011-05-292-4/+5
| * | | | | | t7508: demonstrate status's failure to use --porcelain format with -zBrandon Casey2011-05-291-0/+7
* | | | | | | Sync with 1.7.5.4v1.7.6-rc0Junio C Hamano2011-06-012-1/+5
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Git 1.7.5.4v1.7.5.4Junio C Hamano2011-06-013-2/+6
| * | | | | | Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano2011-06-014-48/+30
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/fmt-req-fix' into maintJunio C Hamano2011-06-011-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-docs' into maintJunio C Hamano2011-06-014-15/+35
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jn/doc-remote-helpers' into maintJunio C Hamano2011-06-011-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano2011-06-011-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diffcore-rename.c: avoid set-but-not-used warningJim Meyering2011-06-011-2/+1
* | | | | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-311-10/+13
* | | | | | | | | | | | Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-3113-92/+174
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | format-patch: preserve subject newlines with -kJeff King2011-05-266-3/+8
| * | | | | | | | | | | | clean up calling conventions for pretty.c functionsJeff King2011-05-267-76/+75
| * | | | | | | | | | | | pretty: add pp_commit_easy function for simple callersJeff King2011-05-267-12/+14
| * | | | | | | | | | | | mailinfo: always clean up rfc822 header foldingJeff King2011-05-262-2/+2
| * | | | | | | | | | | | t: test subject handling in format-patch / am pipelineJeff King2011-05-261-0/+77
* | | | | | | | | | | | | Merge branch 'jn/doc-remote-helpers'Junio C Hamano2011-05-311-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Documentation: do not misinterpret refspecs as bold textJonathan Nieder2011-05-301-3/+3
* | | | | | | | | | | | | Merge branch 'jk/format-patch-empty-prefix'Junio C Hamano2011-05-312-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | format-patch: make zero-length subject prefixes prettierJeff King2011-05-302-1/+20
* | | | | | | | | | | | | | Merge branch 'ab/i18n-envsubst-doc-fix'Junio C Hamano2011-05-311-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-sh-i18n--envsubst: add SYNOPSIS section to the documentationÆvar Arnfjörð Bjarmason2011-05-301-0/+10
* | | | | | | | | | | | | | | Merge branch 'jc/log-quiet-fix'Junio C Hamano2011-05-311-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | log: --quiet should serve as synonym to -sJunio C Hamano2011-05-281-0/+2
* | | | | | | | | | | | | | | | Merge branch 'kk/maint-prefix-in-config-mak'Junio C Hamano2011-05-311-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | config.mak.in: allow "configure --sysconfdir=/else/where"Junio C Hamano2011-05-271-0/+1
* | | | | | | | | | | | | | | | Merge branch 'jk/rebase-head-reflog'Junio C Hamano2011-05-313-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase: write a reflog entry when finishingJeff King2011-05-273-3/+7
| * | | | | | | | | | | | | | | | rebase: create HEAD reflog entry when abortingCsaba Henk2011-05-271-1/+1
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/maint-docs'Junio C Hamano2011-05-314-15/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |