summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lt/merge-tree'Junio C Hamano2006-07-125-16/+378
|\
| * Improved three-way blob merging codeLinus Torvalds2006-06-283-1/+240
| * Prepare "git-merge-tree" for future workLinus Torvalds2006-06-281-15/+119
| * xdiff: generate "anti-diffs" aka what is common to two filesLinus Torvalds2006-06-282-0/+19
* | fmt-merge-msg fixJunio C Hamano2006-07-121-6/+10
* | gitweb: Make command invocations go through the git wrapperAlp Toker2006-07-121-33/+29
* | gitweb: Include a site name in page titlesAlp Toker2006-07-111-2/+6
* | gitweb: Send XHTML as 'application/xhtml+xml' where possibleAlp Toker2006-07-111-2/+12
* | git-fetch: fix a bashism (==)Eric Wong2006-07-111-1/+1
* | Make the unpacked object header functions static to sha1_file.cLinus Torvalds2006-07-112-4/+2
* | git-send-email: Remove redundant Reply-To headerAlp Toker2006-07-111-1/+0
* | typofix (git-name-rev documentation)Alp Toker2006-07-111-1/+1
* | Mention the [user@] part in documentation of ssh:// urls.Yakov Lerner2006-07-111-3/+3
* | tests: Set EDITOR=: and VISUAL=: globallyEric Wong2006-07-114-3/+5
* | Log ref changes made by git-fetch and git-pull.Shawn Pearce2006-07-102-6/+16
* | Record the type of commit operation in the reflog.Shawn Pearce2006-07-102-4/+21
* | Allow user.name and user.email to drive reflog entry.Shawn Pearce2006-07-102-1/+1
* | Fix linking for not-so-clever linkers.Johannes Schindelin2006-07-102-2/+1
* | git-rev-list: add documentation for --parents, --no-mergesMatthias Lederhofer2006-07-101-0/+6
* | Merge branch 'jc/show-merge'Junio C Hamano2006-07-101-2/+51
|\ \
| * | git log -p --merge [[--] paths...]Junio C Hamano2006-07-071-2/+51
* | | Avoid C99 comments, use old-style C comments instead.Pavel Roskin2006-07-1010-31/+33
* | | Fix more typos, primarily in the codePavel Roskin2006-07-1034-56/+56
* | | gitweb.cgi: Teach "a=blob" action to know the blob/file mime typeLuben Tuikov2006-07-101-60/+67
* | | gitweb.cgi: Create $git_temp if it doesn't existLuben Tuikov2006-07-101-0/+3
* | | Merge branch 'lt/gitweb'Junio C Hamano2006-07-101-0/+1
|\ \ \
| * | | Add "raw" output option to blobs in "tree" view formatLuben Tuikov2006-07-091-0/+1
* | | | git-svn: fix --file/-F option in commit-diffEric Wong2006-07-101-3/+3
* | | | Avoid C99 initializersShawn Pearce2006-07-103-24/+16
* | | | Merge branch 'jc/rename'Junio C Hamano2006-07-101-11/+22
|\ \ \ \
| * | | | diffcore-rename: try matching up renames without populating filespec first.Junio C Hamano2006-07-061-11/+22
* | | | | Merge branch 'jc/grep'Junio C Hamano2006-07-091-51/+327
|\ \ \ \ \
| * | | | | git-grep: boolean expression on pattern matching.Junio C Hamano2006-07-051-51/+327
* | | | | | Merge branch 'jc/mailinfo'Junio C Hamano2006-07-091-8/+24
|\ \ \ \ \ \
| * | | | | | mailinfo: assume input is latin-1 on the header as we do for the bodyJunio C Hamano2006-07-061-8/+24
* | | | | | | Merge branch 'ew/diff'Junio C Hamano2006-07-0911-17/+78
|\ \ \ \ \ \ \
| * | | | | | | templates/hooks--update: replace diffstat calls with git diff --statEric Wong2006-07-081-2/+2
| * | | | | | | diff: do not use configuration magic at the core-levelJunio C Hamano2006-07-088-11/+17
| * | | | | | | Update diff-options and config documentation.Junio C Hamano2006-07-072-4/+38
| * | | | | | | diff.c: --no-color to defeat diff.color configuration.Junio C Hamano2006-07-071-0/+2
| * | | | | | | diff.c: respect diff.renames config optionEric Wong2006-07-072-0/+19
* | | | | | | | Merge branch 'ew/svn'Junio C Hamano2006-07-0915-97/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix some doubled word typosAlp Toker2006-07-091-1/+1
| * | | | | | | | Typofix in Makefile comment.Pavel Roskin2006-07-091-1/+1
| * | | | | | | | Makefile: export NO_SVN_TESTSJohannes Schindelin2006-07-071-0/+1
| * | | | | | | | git-svn: migrate out of contrib (follow-up)Junio C Hamano2006-07-071-2/+9
| * | | | | | | | git-svn: migrate out of contribEric Wong2006-07-0614-61/+28
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Fix typos involving the word 'commit'Alp Toker2006-07-092-7/+7
* | | | | | | | Fix some doubled word typosAlp Toker2006-07-091-1/+1
* | | | | | | | "git -p cmd" to page anywhereJunio C Hamano2006-07-094-1/+11