summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2009-12-083-16/+58
|\
| * Merge branch 'mm/maint-merge-ff-error-message-fix' into maintJunio C Hamano2009-12-083-18/+27
| |\
| * \ Merge branch 'jn/maint-pull-rebase-error-message' into maintJunio C Hamano2009-12-081-15/+33
| |\ \
| | * | pull: clarify advice for the unconfigured error caseJan Krüger2009-12-031-15/+33
| * | | Merge branch 'jk/maint-add-p-delete-fix' into maintJunio C Hamano2009-12-082-1/+25
| |\ \ \
| | * | | add-interactive: fix deletion of non-empty filesJeff King2009-12-072-1/+25
* | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-12-081-1/+3
|\ \ \ \ \
| * | | | | git-svn: set svn.authorsfile earlier when cloningAlex Vandiver2009-12-081-1/+1
| * | | | | git-svn: Set svn.authorsfile to an absolute path when cloningAlex Vandiver2009-12-081-1/+3
* | | | | | Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano2009-12-082-9/+3
|/ / / / /
* | | | | git svn: log removals of empty directoriesEric Wong2009-12-072-1/+11
* | | | | git svn: Don't create empty directories whose parents were deletedGreg Price2009-12-071-1/+2
* | | | | git-svn: sort svk merge tickets to account for minimal parentsAlex Vandiver2009-12-071-1/+5
* | | | | bash: update 'git commit' completionSZEDER Gábor2009-12-051-1/+21
* | | | | Sync with 1.6.5.5Junio C Hamano2009-12-0510-22/+80
|\ \ \ \ \ | |/ / / /
| * | | | Git 1.6.5.5v1.6.5.5Junio C Hamano2009-12-054-5/+11
| * | | | Fix diff -B/--dirstat miscounting of newly added contentsLinus Torvalds2009-12-051-1/+10
| * | | | reset: improve worktree safety valvesJeff King2009-12-052-5/+33
| * | | | Documentation: Avoid use of xmlto --stringparamTodd Zullinger2009-12-053-11/+23
| * | | | archive: clarify description of path parameterRené Scharfe2009-12-041-2/+3
| * | | | rerere: don't segfault on failure to open rr-cacheJeff King2009-12-041-0/+2
* | | | | Merge branch 'maint'Junio C Hamano2009-12-033-2/+53
|\ \ \ \ \ | |/ / / /
| * | | | Prepare for 1.6.5.5Junio C Hamano2009-12-031-0/+44
| * | | | Merge branch 'uk/maint-shortlog-encoding' into maintJunio C Hamano2009-12-032-9/+39
| |\ \ \ \
| | * | | | t4201: use ISO8859-1 rather than ISO-8859-1Brandon Casey2009-12-031-2/+2
| * | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maintJunio C Hamano2009-12-032-1/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ap/maint-merge-strategy-list-fix' into maintJunio C Hamano2009-12-031-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-am-keep' into maintJunio C Hamano2009-12-031-5/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano2009-12-039-25/+32
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rj/maint-cygwin-count-objects' into maintJunio C Hamano2009-12-031-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-hint-failed-merge' into maintJunio C Hamano2009-12-035-3/+32
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'th/maint-remote-update-help-string' into maintJunio C Hamano2009-12-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-t9700' into maintJunio C Hamano2009-12-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/maint-mailinfo-no-inbody' into maintJunio C Hamano2009-12-0316-5/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mo/maint-crlf-doc' into maintJunio C Hamano2009-12-031-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'th/remote-usage' into maintJunio C Hamano2009-12-032-21/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/maint-use-custom-perl' into maintJunio C Hamano2009-12-034-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-035-37/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/grep-i-F' into maintJunio C Hamano2009-12-034-6/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-break-rename-reduce-memory' into maintJunio C Hamano2009-12-032-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-simplify-cygwin-makefile' into maintJunio C Hamano2009-12-031-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rg/doc-workflow' into maintJunio C Hamano2009-12-031-0/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'np/maint-sideband-favor-status' into maintJunio C Hamano2009-12-032-23/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: xmlto 0.0.18 does not know --stringparamJunio C Hamano2009-12-031-0/+7
* | | | | | | | | | | | | | | | | | | | | | | | gitweb: Describe (possible) gitweb.js minification in gitweb/READMEJakub Narebski2009-12-031-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | Fix crasher on encountering SHA1-like non-note in notes treeJohan Herland2009-12-032-0/+174
* | | | | | | | | | | | | | | | | | | | | | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey2009-12-031-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge in 1.6.5.4Junio C Hamano2009-12-032-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Git 1.6.5.4v1.6.5.4Junio C Hamano2009-12-032-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | Unconditionally set man.base.url.for.relative.linksJunio C Hamano2009-12-031-2/+5
View Lorry Controller Status