Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 18 | -32/+188 |
|\ | |||||
| * | fsck: detect null sha1 in tree entries | Jeff King | 2012-07-29 | 2 | -1/+33 |
| * | do not write null sha1s to on-disk index | Jeff King | 2012-07-29 | 2 | -0/+21 |
| * | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 | 14 | -32/+135 |
* | | Merge branch 'tr/maint-send-email-2047' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 2 | -4/+19 |
|\ \ | |||||
| * | | send-email: improve RFC2047 quote parsing | Thomas Rast | 2012-07-31 | 2 | -4/+19 |
| |/ | |||||
* | | Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -3/+5 |
|\ \ | |||||
| * | | setup: clarify error messages for file/revisions ambiguity | Matthieu Moy | 2012-08-03 | 1 | -3/+5 |
* | | | Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO | Jay Soffian | 2012-08-15 | 1 | -0/+5 |
* | | | | Prepare for 1.7.11.6 | Junio C Hamano | 2012-08-24 | 2 | -1/+35 |
* | | | | Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | man: git pull -r is a short for --rebase | Miklos Vajna | 2012-08-17 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | gitcli: describe abbreviation of long options | Junio C Hamano | 2012-08-16 | 1 | -0/+8 |
| |/ / / | |||||
* | | | | Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -7/+24 |
|\ \ \ \ | |||||
| * | | | | rev-list docs: clarify --topo-order description | Junio C Hamano | 2012-08-15 | 1 | -7/+24 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'hv/coding-guidelines' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | Documentation/CodingGuidelines: spell out more shell guidelines | Heiko Voigt | 2012-08-15 | 1 | -0/+8 |
* | | | | | Merge branch 'jc/tag-doc' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 7 | -16/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation: do not mention .git/refs/* directories | Junio C Hamano | 2012-08-06 | 7 | -16/+27 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'mk/test-seq' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 3 | -2/+23 |
|\ \ \ \ \ | |||||
| * | | | | | tests: Introduce test_seq | MichaĆ Kiedrowicz | 2012-08-04 | 3 | -2/+23 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -3/+0 |
|\ \ \ \ \ | |||||
| * | | | | | builtin.h: remove unused cmd_<foo> declarations | Luka Perkov | 2012-06-15 | 1 | -3/+0 |
* | | | | | | Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 2 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enable HAVE_DEV_TTY for Solaris | Ben Walton | 2012-08-06 | 1 | -0/+1 |
| * | | | | | | terminal: seek when switching between reading and writing | Jeff King | 2012-08-06 | 1 | -0/+1 |
* | | | | | | | Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: check committer identity more strictly | Jeff King | 2012-07-23 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Make the ciabot scripts completely self-configuring in the normal case. | Eric S. Raymond | 2012-08-23 | 4 | -37/+72 |
* | | | | | | | Improved documentation for the ciabot scripts. | Eric S. Raymond | 2012-08-23 | 2 | -2/+50 |
* | | | | | | | contrib/ciabot: Get ciabot configuration from git variables | Eric S. Raymond | 2012-08-22 | 2 | -118/+156 |
* | | | | | | | Git 1.7.11.5v1.7.11.5 | Junio C Hamano | 2012-08-15 | 3 | -2/+11 |
* | | | | | | | Merge branch 'rj/maint-grep-remove-redundant-test' into maint | Junio C Hamano | 2012-08-15 | 1 | -11/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7810-*.sh: Remove redundant test | Ramsay Jones | 2012-07-29 | 1 | -11/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'hv/link-alt-odb-entry' into maint | Junio C Hamano | 2012-08-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | link_alt_odb_entry: fix read over array bounds reported by valgrind | Heiko Voigt | 2012-07-29 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Prepare for 1.7.11.5 | Junio C Hamano | 2012-08-06 | 2 | -1/+29 |
* | | | | | | | Merge branch 'jn/block-sha1' into maint | Junio C Hamano | 2012-08-06 | 2 | -7/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads | Jonathan Nieder | 2012-07-23 | 1 | -3/+2 |
| * | | | | | | | block-sha1: put expanded macro parameters in parentheses | Jonathan Nieder | 2012-07-22 | 1 | -2/+2 |
| * | | | | | | | block-sha1: avoid pointer conversion that violates alignment constraints | Jonathan Nieder | 2012-07-22 | 1 | -3/+3 |
* | | | | | | | | Merge branch 'jn/make-assembly-in-right-directory' into maint | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Makefile: fix location of listing produced by "make subdir/foo.s" | Jonathan Nieder | 2012-07-22 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ms/daemon-doc-typo' into maint | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation/git-daemon: add missing word | Michael Schubert | 2012-07-16 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'lm/git-blame-el' into maint | Junio C Hamano | 2012-08-06 | 1 | -36/+37 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-blame.el: Do not use bare 0 to mean (point-min) | Lawrence Mitchell | 2012-06-14 | 1 | -1/+1 |
| * | | | | | | | | | git-blame.el: Use with-current-buffer where appropriate | Lawrence Mitchell | 2012-06-14 | 1 | -37/+37 |