summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-1018-32/+188
|\
| * fsck: detect null sha1 in tree entriesJeff King2012-07-292-1/+33
| * do not write null sha1s to on-disk indexJeff King2012-07-292-0/+21
| * diff: do not use null sha1 as a sentinel valueJeff King2012-07-2914-32/+135
* | Merge branch 'tr/maint-send-email-2047' into maint-1.7.11Junio C Hamano2012-09-102-4/+19
|\ \
| * | send-email: improve RFC2047 quote parsingThomas Rast2012-07-312-4/+19
| |/
* | Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11Junio C Hamano2012-09-101-3/+5
|\ \
| * | setup: clarify error messages for file/revisions ambiguityMatthieu Moy2012-08-031-3/+5
* | | Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11Junio C Hamano2012-09-101-0/+5
|\ \ \
| * | | gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFOJay Soffian2012-08-151-0/+5
* | | | Prepare for 1.7.11.6Junio C Hamano2012-08-242-1/+35
* | | | Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11Junio C Hamano2012-08-241-0/+1
|\ \ \ \
| * | | | man: git pull -r is a short for --rebaseMiklos Vajna2012-08-171-0/+1
| |/ / /
* | | | Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11Junio C Hamano2012-08-241-0/+8
|\ \ \ \
| * | | | gitcli: describe abbreviation of long optionsJunio C Hamano2012-08-161-0/+8
| |/ / /
* | | | Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11Junio C Hamano2012-08-241-7/+24
|\ \ \ \
| * | | | rev-list docs: clarify --topo-order descriptionJunio C Hamano2012-08-151-7/+24
| | |_|/ | |/| |
* | | | Merge branch 'hv/coding-guidelines' into maint-1.7.11Junio C Hamano2012-08-241-0/+8
|\ \ \ \
| * | | | Documentation/CodingGuidelines: spell out more shell guidelinesHeiko Voigt2012-08-151-0/+8
* | | | | Merge branch 'jc/tag-doc' into maint-1.7.11Junio C Hamano2012-08-247-16/+27
|\ \ \ \ \
| * | | | | Documentation: do not mention .git/refs/* directoriesJunio C Hamano2012-08-067-16/+27
| | |/ / / | |/| | |
* | | | | Merge branch 'mk/test-seq' into maint-1.7.11Junio C Hamano2012-08-243-2/+23
|\ \ \ \ \
| * | | | | tests: Introduce test_seqMichaƂ Kiedrowicz2012-08-043-2/+23
| | |_|_|/ | |/| | |
* | | | | Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11Junio C Hamano2012-08-241-3/+0
|\ \ \ \ \
| * | | | | builtin.h: remove unused cmd_<foo> declarationsLuka Perkov2012-06-151-3/+0
* | | | | | Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11Junio C Hamano2012-08-242-0/+2
|\ \ \ \ \ \
| * | | | | | Enable HAVE_DEV_TTY for SolarisBen Walton2012-08-061-0/+1
| * | | | | | terminal: seek when switching between reading and writingJeff King2012-08-061-0/+1
* | | | | | | Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11Junio C Hamano2012-08-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | commit: check committer identity more strictlyJeff King2012-07-231-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Make the ciabot scripts completely self-configuring in the normal case.Eric S. Raymond2012-08-234-37/+72
* | | | | | | Improved documentation for the ciabot scripts.Eric S. Raymond2012-08-232-2/+50
* | | | | | | contrib/ciabot: Get ciabot configuration from git variablesEric S. Raymond2012-08-222-118/+156
* | | | | | | Git 1.7.11.5v1.7.11.5Junio C Hamano2012-08-153-2/+11
* | | | | | | Merge branch 'rj/maint-grep-remove-redundant-test' into maintJunio C Hamano2012-08-151-11/+0
|\ \ \ \ \ \ \
| * | | | | | | t7810-*.sh: Remove redundant testRamsay Jones2012-07-291-11/+0
| |/ / / / / /
* | | | | | | Merge branch 'hv/link-alt-odb-entry' into maintJunio C Hamano2012-08-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | link_alt_odb_entry: fix read over array bounds reported by valgrindHeiko Voigt2012-07-291-1/+1
| |/ / / / / /
* | | | | | | Prepare for 1.7.11.5Junio C Hamano2012-08-062-1/+29
* | | | | | | Merge branch 'jn/block-sha1' into maintJunio C Hamano2012-08-062-7/+6
|\ \ \ \ \ \ \
| * | | | | | | Makefile: BLK_SHA1 does not require fast htonl() and unaligned loadsJonathan Nieder2012-07-231-3/+2
| * | | | | | | block-sha1: put expanded macro parameters in parenthesesJonathan Nieder2012-07-221-2/+2
| * | | | | | | block-sha1: avoid pointer conversion that violates alignment constraintsJonathan Nieder2012-07-221-3/+3
* | | | | | | | Merge branch 'jn/make-assembly-in-right-directory' into maintJunio C Hamano2012-08-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: fix location of listing produced by "make subdir/foo.s"Jonathan Nieder2012-07-221-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ms/daemon-doc-typo' into maintJunio C Hamano2012-08-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/git-daemon: add missing wordMichael Schubert2012-07-161-1/+1
* | | | | | | | | Merge branch 'lm/git-blame-el' into maintJunio C Hamano2012-08-061-36/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-blame.el: Do not use bare 0 to mean (point-min)Lawrence Mitchell2012-06-141-1/+1
| * | | | | | | | | git-blame.el: Use with-current-buffer where appropriateLawrence Mitchell2012-06-141-37/+37