summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gitweb: Better cutting matched string and its contextJakub Narebski2008-02-251-16/+57
* Add tests for filesystem challenges (case and unicode normalization)Steffen Prohaska2008-02-251-0/+93
* git-bundle.txt: Add different strategies to create the bundleSanti BĂ©jar2008-02-241-9/+35
* builtin-for-each-ref.c: fix typo in error messageMichele Ballabio2008-02-241-1/+1
* send-email: test compose functionalityJeff King2008-02-241-0/+29
* t9001: enhance fake sendmail test harnessJeff King2008-02-241-7/+15
* Merge branch 'lt/dirstat'Junio C Hamano2008-02-242-1/+97
|\
| * diff --dirstat: saner handling of binary and unmerged filesJunio C Hamano2008-02-241-1/+6
| * Add "--dirstat" for some directory statisticsLinus Torvalds2008-02-122-1/+92
* | Merge branch 'jc/apply-whitespace'Junio C Hamano2008-02-247-245/+799
|\ \
| * | ws_fix_copy(): move the whitespace fixing function to ws.cJunio C Hamano2008-02-233-108/+108
| * | apply: do not barf on patch with too large an offsetJunio C Hamano2008-02-112-0/+60
| * | core.whitespace: cr-at-eolJunio C Hamano2008-02-055-6/+72
| * | git-apply --whitespace=fix: fix whitespace fuzz introduced by previous runJunio C Hamano2008-02-052-5/+231
| * | builtin-apply.c: pass ws_rule down to match_fragment()Junio C Hamano2008-02-051-3/+5
| * | builtin-apply.c: move copy_wsfix() function a bit higher.Junio C Hamano2008-02-051-94/+94
| * | builtin-apply.c: do not feed copy_wsfix() leading '+'Junio C Hamano2008-02-051-20/+18
| * | builtin-apply.c: simplify calling site to apply_line()Junio C Hamano2008-02-051-18/+20
| * | builtin-apply.c: clean-up apply_one_fragment()Junio C Hamano2008-02-051-28/+27
| * | builtin-apply.c: mark common context lines in lineinfo structure.Junio C Hamano2008-02-051-25/+32
| * | builtin-apply.c: optimize match_beginning/end processing a bit.Junio C Hamano2008-02-051-0/+10
| * | builtin-apply.c: make it more line orientedJunio C Hamano2008-02-051-123/+280
| * | builtin-apply.c: push match-beginning/end logic downJunio C Hamano2008-02-051-14/+32
| * | builtin-apply.c: restructure "offset" matchingJunio C Hamano2008-02-051-24/+25
| * | builtin-apply.c: refactor small part that matches contextJunio C Hamano2008-02-051-5/+13
* | | Merge branch 'maint'Junio C Hamano2008-02-242-2/+2
|\ \ \
| * | | Protect peel_ref fallback case from NULL parse_object resultShawn O. Pearce2008-02-241-1/+1
| * | | Ensure 'make dist' compiles git-archive.exe on CygwinShawn O. Pearce2008-02-241-1/+1
* | | | Be more verbose when checkout takes a long timeLinus Torvalds2008-02-242-5/+8
* | | | gitweb: Fix bugs in git_search_grep_body: it's length(), not len()Jakub Narebski2008-02-231-1/+1
* | | | Sync with 1.5.4.3Junio C Hamano2008-02-237-12/+67
|\ \ \ \ | |/ / /
| * | | GIT 1.5.4.3v1.5.4.3Junio C Hamano2008-02-233-3/+31
| * | | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2008-02-235-15/+50
| |\ \ \
| | * | | git-gui: Focus insertion point at end of strings in repository chooserShawn O. Pearce2008-02-221-0/+4
| | * | | git-gui: Avoid hardcoded Windows paths in Cygwin package filesShawn O. Pearce2008-02-221-1/+11
| | * | | git-gui: Default TCL_PATH to same location as TCLTK_PATHShawn O. Pearce2008-02-221-1/+5
| | * | | git-gui: Paper bag fix error dialogs opening over the main windowShawn O. Pearce2008-02-221-1/+5
| | * | | git-gui: Ensure error dialogs always appear over all other windowsShawn O. Pearce2008-02-201-7/+11
| | * | | git-gui: relax "dirty" version detectionWincent Colaiuta2008-02-191-1/+1
* | | | | pull: pass --strategy along to to rebaseJay Soffian2008-02-221-1/+2
* | | | | Use helper function for copying index entry informationLinus Torvalds2008-02-222-2/+18
* | | | | Name hash fixups: export (and rename) remove_hash_entryLinus Torvalds2008-02-223-16/+17
* | | | | Fix name re-hashing semanticsLinus Torvalds2008-02-222-6/+12
* | | | | Merge branch 'maint'Junio C Hamano2008-02-221-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | hash: fix lookup_hash semanticsJeff King2008-02-221-1/+1
* | | | | gitweb: Better chopping in commit search resultsJunio C Hamano2008-02-221-9/+15
* | | | | builtin-tag.c: remove cruftGerrit Pape2008-02-221-3/+0
* | | | | git-merge-index documentation: clarify synopsisGerrit Pape2008-02-222-2/+2
* | | | | send-email: fix In-Reply-To regressionJay Soffian2008-02-212-3/+27
* | | | | git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()Junio C Hamano2008-02-212-1/+47