summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | builtin-grep: support '-l' option.Junio C Hamano2006-05-011-0/+10
| * | | | | | builtin-grep: wildcard pathspec fixesJunio C Hamano2006-05-011-23/+62
| * | | | | | built-in "git grep"Junio C Hamano2006-05-014-1/+457
* | | | | | | Merge branch 'lt/diff'Junio C Hamano2006-05-153-1/+53
|\ \ \ \ \ \ \
| * | | | | | | git diff: support "-U" and "--unified" options properlyLinus Torvalds2006-05-143-1/+53
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix'Junio C Hamano2006-05-156-26/+96
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Fix pack-index issue on 64-bit platforms a bit more portably.v1.3.3Junio C Hamano2006-05-152-4/+2
| * | | | | Install git-send-email by defaultEric Wong2006-05-152-7/+4
| * | | | | Fix compilation on newer NetBSD systemsDennis Stosberg2006-05-151-1/+3
| * | | | | Merge branch 'fix' into maintJunio C Hamano2006-05-151-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix' into maintJunio C Hamano2006-05-142-0/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | git config syntax updatesLinus Torvalds2006-05-133-20/+90
| * | | | | | Another config file parsing fix.sean2006-05-131-1/+3
| * | | | | | checkout: use --aggressive when running a 3-way merge (-m).Junio C Hamano2006-05-131-1/+1
* | | | | | | Merge branch 'fix'Junio C Hamano2006-05-151-0/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Ensure author & committer before asking for commit message.Sean2006-05-141-0/+2
| | |/ / / / | |/| | | |
* | | | | | Install git-send-email by defaultEric Wong2006-05-142-7/+4
* | | | | | send-email: address expansion for common mailersEric Wong2006-05-141-0/+48
* | | | | | diffstat rename squashing fix.Junio C Hamano2006-05-141-2/+7
| |_|/ / / |/| | | |
* | | | | Merge branch 'fix'Junio C Hamano2006-05-142-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | include header to define uint32_t, necessary on Mac OS XBen Clifford2006-05-142-0/+2
| |/ / /
* | | | Merge branch 'ml/cvs'Junio C Hamano2006-05-143-97/+187
|\ \ \ \
| * \ \ \ Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff...Junio C Hamano2006-05-093-97/+187
| |\ \ \ \
| | * | | | Change to allow subdir updates from EclipseMartyn Smith2006-05-081-11/+27
| | * | | | Many fixes for most operations in Eclipse.Martyn Smith2006-05-081-82/+139
| | * | | | Added logged warnings for CVS error returnsMartyn Smith2006-05-081-0/+2
| | * | | | Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff2006-05-0858-819/+2848
| | |\ \ \ \
| | * | | | | cvsserver: use git-rev-list instead of git-logMartin Langhoff2006-05-041-2/+3
| | * | | | | Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff2006-05-0311-63/+231
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff2006-05-0137-2321/+2423
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.Martin Langhoff2006-04-262-8/+23
* | | | | | | | Merge branch 'fix'Junio C Hamano2006-05-132-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix git-pack-objects for 64-bit platformsDennis Stosberg2006-05-132-2/+2
* | | | | | | fix diff-delta bad memory accessNicolas Pitre2006-05-101-5/+0
* | | | | | | Merge branch 'fix'Junio C Hamano2006-05-092-2/+2
|\ \ \ \ \ \ \
| * | | | | | | checkout: use --aggressive when running a 3-way merge (-m).Junio C Hamano2006-05-091-1/+1
| |/ / / / / /
| * | | | | | revert/cherry-pick: use aggressive merge.Linus Torvalds2006-05-091-1/+1
* | | | | | | Merge branch 'jc/clean'Junio C Hamano2006-05-092-5/+17
|\ \ \ \ \ \ \
| * | | | | | | Teach git-clean optional <paths>... parameters.Junio C Hamano2006-05-082-5/+17
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mw/alternates'Junio C Hamano2006-05-093-77/+212
|\ \ \ \ \ \ \
| * | | | | | | clone: don't clone the info/alternates fileMartin Waitz2006-05-071-5/+1
| * | | | | | | test case for transitive info/alternatesMartin Waitz2006-05-071-0/+105
| * | | | | | | Transitively read alternativesMartin Waitz2006-05-071-72/+106
* | | | | | | | Merge branch 'jc/xsha1'Junio C Hamano2006-05-091-8/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | get_sha1() - fix infinite loop on nonexistent stage.Junio C Hamano2006-05-081-0/+1
| * | | | | | | | get_sha1(): :path and :[0-3]:path to extract from index.Junio C Hamano2006-04-301-8/+46
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/again'Junio C Hamano2006-05-093-4/+142
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix users of prefix_path() to free() only when necessaryJohannes Schindelin2006-05-062-6/+6
| * | | | | | | | update-index --again: take optional pathspecsJunio C Hamano2006-05-052-2/+13
| * | | | | | | | update-index --againJunio C Hamano2006-05-053-4/+131