Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Teach rm to remove submodules when given with a trailing '/' | Jens Lehmann | 2012-11-23 | 2 | -0/+32 |
* | docs: move submodule section | Matt Kraai | 2012-11-14 | 1 | -15/+15 |
* | submodule: teach rm to remove submodules unless they contain a git directory | Jens Lehmann | 2012-09-29 | 5 | -15/+550 |
* | First half of the second batch for 1.8.0 | Junio C Hamano | 2012-08-27 | 1 | -0/+37 |
* | Merge branch 'jk/docs-docbook-monospace-display' | Junio C Hamano | 2012-08-27 | 2 | -3/+3 |
|\ | |||||
| * | docs: monospace listings in docbook output | Jeff King | 2012-08-07 | 2 | -3/+3 |
* | | Merge branch 'da/difftool-updates' | Junio C Hamano | 2012-08-27 | 6 | -101/+244 |
|\ \ | |||||
| * | | difftool: silence warning | Ross Lagerwall | 2012-08-21 | 1 | -1/+1 |
| * | | Add Code Compare v2.80.4 as a merge / diff tool for Windows | Sebastian Schuberth | 2012-08-10 | 3 | -2/+27 |
| * | | mergetool,difftool: Document --tool-help consistently | David Aguilar | 2012-08-10 | 2 | -3/+6 |
| * | | difftool: Disable --symlinks on cygwin | David Aguilar | 2012-07-26 | 1 | -1/+2 |
| * | | difftool: Handle compare() returning -1 | David Aguilar | 2012-07-26 | 1 | -31/+68 |
| * | | difftool: Wrap long lines for readability | David Aguilar | 2012-07-26 | 1 | -14/+32 |
| * | | difftool: Check all return codes from compare() | David Aguilar | 2012-07-25 | 1 | -1/+10 |
| * | | difftool: Handle finding mergetools/ in a path with spaces | David Aguilar | 2012-07-25 | 1 | -6/+21 |
| * | | difftool: Use symlinks when diffing against the worktree | David Aguilar | 2012-07-23 | 2 | -10/+31 |
| * | | difftool: Call the temp directory "git-difftool" | David Aguilar | 2012-07-22 | 1 | -1/+1 |
| * | | difftool: Move option values into a hash | David Aguilar | 2012-07-22 | 1 | -24/+31 |
| * | | difftool: Eliminate global variables | David Aguilar | 2012-07-22 | 1 | -53/+75 |
| * | | difftool: Simplify print_tool_help() | David Aguilar | 2012-07-22 | 1 | -20/+5 |
* | | | 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 |