summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mc/sendmail'Junio C Hamano2007-02-271-44/+53
|\
| * git-send-email: abort/usage on bad optionMichael Coleman2007-02-271-44/+53
* | Merge branch 'js/diff-ni' (early part)Junio C Hamano2007-02-2712-86/+285
|\ \
| * | diff --no-index: also imitate the exit status of diff(1)Johannes Schindelin2007-02-263-3/+17
| * | Merge branch 'master' into js/diff-niJunio C Hamano2007-02-26109-2908/+6722
| |\ \
| * | | Fix typo: do not show name1 when name2 failsJohannes Schindelin2007-02-251-1/+1
| * | | Evil Merge branch 'jc/status' (early part) into js/diff-niJunio C Hamano2007-02-246-22/+44
| |\ \ \
| | * | | run_diff_{files,index}(): update calling convention.Junio C Hamano2007-02-225-11/+27
| | * | | update-index: do not die too early in a read-only repository.Junio C Hamano2007-02-221-1/+10
| | * | | git-status: do not be totally useless in a read-only repository.Junio C Hamano2007-02-221-10/+11
| | | |/ | | |/|
| * | | Teach git-diff-files the new option `--no-index`Johannes Schindelin2007-02-228-64/+227
* | | | 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
|\ \ \ \ \