Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/grep-patterntype-config' | Junio C Hamano | 2012-08-27 | 5 | -42/+281 |
|\ | |||||
| * | grep: add a grep.patternType configuration setting | J Smith | 2012-08-03 | 5 | -42/+281 |
* | | Merge branch 'bc/receive-pack-stdout-protection' | Junio C Hamano | 2012-08-27 | 2 | -1/+37 |
|\ \ | |||||
| * | | receive-pack: do not leak output from auto-gc to standard output | Junio C Hamano | 2012-08-06 | 2 | -2/+3 |
| * | | t/t5400: demonstrate breakage caused by informational message from prune | Brandon Casey | 2012-08-06 | 1 | -0/+35 |
* | | | Merge branch 'ab/diff-write-incomplete-line' | Junio C Hamano | 2012-08-27 | 2 | -0/+31 |
|\ \ \ | |||||
| * | | | Fix '\ No newline...' annotation in rewrite diffs | Adam Butcher | 2012-08-05 | 2 | -0/+31 |
* | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' | Junio C Hamano | 2012-08-27 | 1 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD" | Junio C Hamano | 2012-07-30 | 1 | -8/+8 |
* | | | | | Merge branch 'jk/maint-null-in-trees' | Junio C Hamano | 2012-08-27 | 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 'mm/push-default-switch-warning' | Junio C Hamano | 2012-08-27 | 2 | -3/+31 |
|\ \ \ \ \ | |||||
| * | | | | | push: start warning upcoming default change for push.default | Matthieu Moy | 2012-06-24 | 2 | -3/+31 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-08-24 | 5 | -23/+140 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-08-24 | 19 | -48/+231 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | 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 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 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 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'hv/coding-guidelines' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -0/+8 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/tag-doc' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 7 | -16/+27 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mk/test-seq' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 3 | -2/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 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 |
* | | | | | | | | | | | | | | | | Kick off cycle towards 1.8.0 | Junio C Hamano | 2012-08-22 | 3 | -2/+46 |
* | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-08-22 | 2 | -118/+156 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-08-22 | 2 | -118/+156 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | contrib/ciabot: Get ciabot configuration from git variables | Eric S. Raymond | 2012-08-22 | 2 | -118/+156 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/doc-git-updates' | Junio C Hamano | 2012-08-22 | 1 | -28/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Documentation: update the introductory section | Junio C Hamano | 2012-08-17 | 1 | -28/+32 |
* | | | | | | | | | | | | | | | | | Merge branch 'mv/pull-r-for-rebase' | Junio C Hamano | 2012-08-22 | 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' | Junio C Hamano | 2012-08-22 | 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' | Junio C Hamano | 2012-08-22 | 1 | -7/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | rev-list docs: clarify --topo-order description | Junio C Hamano | 2012-08-15 | 1 | -7/+24 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'hv/coding-guidelines' | Junio C Hamano | 2012-08-22 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Documentation/CodingGuidelines: spell out more shell guidelines | Heiko Voigt | 2012-08-15 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | Merge branch 'jk/check-docs-update' | Junio C Hamano | 2012-08-22 | 6 | -29/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | check-docs: get documented command list from Makefile | Jeff King | 2012-08-08 | 2 | -24/+5 |
| * | | | | | | | | | | | | | | | check-docs: drop git-help special-case | Jeff King | 2012-08-08 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | check-docs: list git-gui as a command | Jeff King | 2012-08-08 | 1 | -2/+1 |
| * | | | | | | | | | | | | | | | check-docs: factor out command-list | Jeff King | 2012-08-08 | 1 | -2/+6 |
| * | | | | | | | | | | | | | | | command-list: mention git-credential-* helpers | Jeff King | 2012-08-08 | 4 | -3/+5 |
| * | | | | | | | | | | | | | | | command-list: add git-sh-i18n | Jeff King | 2012-08-08 | 1 | -0/+1 |