summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2007-02-277-29/+35
|\
| * builtin-fmt-merge-msg: fix bugs in --file optionMichael Coleman2007-02-271-1/+3
| * index-pack: Loop over pread until data loading is complete.Shawn O. Pearce2007-02-271-2/+8
| * blameview: Fix the browse behavior in blameviewAneesh Kumar2007-02-271-1/+1
| * Fix minor typos/grammar in user-manual.txtMichael Coleman2007-02-271-17/+14
| * Correct ordering in git-cvsimport's option documentationMichael Poole2007-02-271-5/+4
| * git-show: Reject native refLinus Torvalds2007-02-271-0/+2
| * Fix git-show man page formatting in the EXAMPLES sectionTheodore Tso2007-02-271-3/+3
* | cvsserver: Make always-binary mode a config file optionAndy Parkins2007-02-271-9/+38
* | cvsserver: Remove trailing "\n" from commithash in checkin functionAndy Parkins2007-02-271-0/+1
* | Make 'cvs ci' lockless in git-cvsserver by using git-update-refJunio C Hamano2007-02-271-27/+16
* | Merge branch 'maint'Junio C Hamano2007-02-278-23/+152
|\ \ | |/
| * git-apply: do not fix whitespaces on context lines.Junio C Hamano2007-02-271-1/+2
| * diff --cc: integer overflow given a 2GB-or-larger fileJim Meyering2007-02-271-3/+3
| * mailinfo: do not get confused with logical lines that are too long.Linus Torvalds2007-02-276-19/+147
* | Documentation: link in 1.5.0.2 material to the top documentation page.Junio C Hamano2007-02-261-1/+3
* | Documentation: document remote.<name>.tagoptAneesh Kumar K.V2007-02-261-0/+4
* | Merge branch 'maint'Junio C Hamano2007-02-264-18/+64
|\ \ | |/
| * GIT 1.5.0.2v1.5.0.2Junio C Hamano2007-02-262-12/+18
| * git-remote: support remotes with a dot in the namePavel Roskin2007-02-261-1/+1
| * Documentation: describe "-f/-t/-m" options to "git-remote add"Junio C Hamano2007-02-251-0/+13
| * diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano2007-02-252-7/+34
* | Merge branch 'maint'Junio C Hamano2007-02-252-2/+2
|\ \ | |/
| * Merge branch 'jc/merge-symlink' into maintJunio C Hamano2007-02-252-2/+2
| |\
| | * merge-recursive: fix longstanding bug in merging symlinksJunio C Hamano2007-02-251-1/+1
| | * merge-index: fix longstanding bug in merging symlinksJunio C Hamano2007-02-251-1/+1
* | | diff --cached: give more sensible error message when HEAD is yet to be created.Junio C Hamano2007-02-251-0/+2
* | | Update tests to use test-chmtimeEric Wong2007-02-253-34/+27
* | | Add test-chmtime: a utility to change mtime on filesEric Wong2007-02-253-1/+66
* | | Merge branch 'maint'Junio C Hamano2007-02-254-15/+97
|\ \ \ | |/ /
| * | Add Release Notes to prepare for 1.5.0.2Junio C Hamano2007-02-252-1/+60
| * | Allow arbitrary number of arguments to git-pack-objectsRoland Dreier2007-02-251-3/+9
| * | rerere: do not deal with symlinks.Junio C Hamano2007-02-251-5/+9
| * | rerere: do not skip two conflicted paths next to each other.Junio C Hamano2007-02-251-1/+1
| * | Merge git://repo.or.cz/git-gui into maintJunio C Hamano2007-02-241-6/+19
| |\ \
| | * | Don't modify CREDITS-FILE if it hasn't changed.Junio C Hamano2007-02-251-6/+19
* | | | Merge branch 'js/apply'Junio C Hamano2007-02-241-1/+6
|\ \ \ \
| * | | | apply: make --verbose a little more usefulJohannes Schindelin2007-02-221-1/+6
| | |_|/ | |/| |
* | | | Merge branch 'js/no-limit-boundary'Junio C Hamano2007-02-241-4/+21
|\ \ \ \
| * | | | rev-list --max-age, --max-count: support --boundaryJohannes Schindelin2007-02-191-4/+21
| |/ / /
* | | | Merge branch 'js/etc-config'Junio C Hamano2007-02-245-7/+22
|\ \ \ \
| * | | | Make tests independent of global config filesJohannes Schindelin2007-02-221-2/+2
| * | | | config: read system-wide defaults from /etc/gitconfigJohannes Schindelin2007-02-194-5/+20
| |/ / /
* | | | Merge branch 'maint'Junio C Hamano2007-02-245-16/+41
|\ \ \ \ | | |/ / | |/| |
| * | | diff-patch: Avoid emitting double-slashes in textual patch.Junio C Hamano2007-02-241-2/+4
| * | | Reword git-am 3-way fallback failure message.Junio C Hamano2007-02-241-1/+1
| * | | Limit filename for format-patchRobin Rosenberg2007-02-241-7/+21
| * | | core.legacyheaders: Use the description used in RelNotes-1.5.0Santi BĂ©jar2007-02-241-4/+11
| * | | git-show-ref --verify: Fail if called without a referenceDmitry V. Levin2007-02-241-2/+4
* | | | .mailmap maintenance after pulling from git-svnJunio C Hamano2007-02-231-0/+1