summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Teach rm to remove submodules when given with a trailing '/'Jens Lehmann2012-11-232-0/+32
* docs: move submodule sectionMatt Kraai2012-11-141-15/+15
* submodule: teach rm to remove submodules unless they contain a git directoryJens Lehmann2012-09-295-15/+550
* First half of the second batch for 1.8.0Junio C Hamano2012-08-271-0/+37
* Merge branch 'jk/docs-docbook-monospace-display'Junio C Hamano2012-08-272-3/+3
|\
| * docs: monospace listings in docbook outputJeff King2012-08-072-3/+3
* | Merge branch 'da/difftool-updates'Junio C Hamano2012-08-276-101/+244
|\ \
| * | difftool: silence warningRoss Lagerwall2012-08-211-1/+1
| * | Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth2012-08-103-2/+27
| * | mergetool,difftool: Document --tool-help consistentlyDavid Aguilar2012-08-102-3/+6
| * | difftool: Disable --symlinks on cygwinDavid Aguilar2012-07-261-1/+2
| * | difftool: Handle compare() returning -1David Aguilar2012-07-261-31/+68
| * | difftool: Wrap long lines for readabilityDavid Aguilar2012-07-261-14/+32
| * | difftool: Check all return codes from compare()David Aguilar2012-07-251-1/+10
| * | difftool: Handle finding mergetools/ in a path with spacesDavid Aguilar2012-07-251-6/+21
| * | difftool: Use symlinks when diffing against the worktreeDavid Aguilar2012-07-232-10/+31
| * | difftool: Call the temp directory "git-difftool"David Aguilar2012-07-221-1/+1
| * | difftool: Move option values into a hashDavid Aguilar2012-07-221-24/+31
| * | difftool: Eliminate global variablesDavid Aguilar2012-07-221-53/+75
| * | difftool: Simplify print_tool_help()David Aguilar2012-07-221-20/+5
* | | Merge branch 'js/grep-patterntype-config'Junio C Hamano2012-08-275-42/+281
|\ \ \
| * | | grep: add a grep.patternType configuration settingJ Smith2012-08-035-42/+281
* | | | Merge branch 'bc/receive-pack-stdout-protection'Junio C Hamano2012-08-272-1/+37
|\ \ \ \
| * | | | receive-pack: do not leak output from auto-gc to standard outputJunio C Hamano2012-08-062-2/+3
| * | | | t/t5400: demonstrate breakage caused by informational message from pruneBrandon Casey2012-08-061-0/+35
* | | | | Merge branch 'ab/diff-write-incomplete-line'Junio C Hamano2012-08-272-0/+31
|\ \ \ \ \
| * | | | | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-052-0/+31
* | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'Junio C Hamano2012-08-271-8/+8
|\ \ \ \ \ \
| * | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD"Junio C Hamano2012-07-301-8/+8
* | | | | | | Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-2718-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 'mm/push-default-switch-warning'Junio C Hamano2012-08-272-3/+31
|\ \ \ \ \ \ \
| * | | | | | | push: start warning upcoming default change for push.defaultMatthieu Moy2012-06-242-3/+31
* | | | | | | | Merge branch 'maint'Junio C Hamano2012-08-245-23/+140
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-08-2419-48/+231
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11Junio C Hamano2012-08-241-0/+8
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11Junio C Hamano2012-08-241-7/+24
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'hv/coding-guidelines' into maint-1.7.11Junio C Hamano2012-08-241-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/tag-doc' into maint-1.7.11Junio C Hamano2012-08-247-16/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/test-seq' into maint-1.7.11Junio C Hamano2012-08-243-2/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11Junio C Hamano2012-08-241-3/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11Junio C Hamano2012-08-242-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11Junio C Hamano2012-08-241-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
* | | | | | | | | | | | | | | | | | Kick off cycle towards 1.8.0Junio C Hamano2012-08-223-2/+46