summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* color-words: take an optional regular expression describing wordsJohannes Schindelin2009-01-174-10/+118
* color-words: change algorithm to allow for 0-character word boundariesJohannes Schindelin2009-01-172-66/+157
* color-words: refactor word splitting and use ALLOC_GROW()Johannes Schindelin2009-01-171-21/+19
* Add color_fwrite_lines(), a function coloring each line individuallyJohannes Schindelin2009-01-172-0/+29
* Merge branch 'maint'Junio C Hamano2009-01-132-1/+4
|\
| * Merge branch 'kk/maint-http-push' into maintJunio C Hamano2009-01-131-6/+19
| |\
| * \ Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano2009-01-132-0/+28
| |\ \
| * \ \ Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano2009-01-132-0/+119
| |\ \ \
| * \ \ \ Merge branch 'ap/maint-apply-modefix' into maintJunio C Hamano2009-01-132-1/+65
| |\ \ \ \
| * \ \ \ \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-132-1/+4
| |\ \ \ \ \
| | * | | | | Avoid spurious error messages on error mistakes.Pierre Habouzit2009-01-131-1/+1
| | * | | | | contrib/examples/README: give an explanation of the status of these filesjidanni@jidanni.org2009-01-121-0/+3
* | | | | | | Fix Documentation typos surrounding the word 'handful'.Jon Loeliger2009-01-138-11/+11
* | | | | | | sha1_file: make "read_object" staticChristian Couder2009-01-132-5/+5
* | | | | | | contrib/vim: change URL to point to the latest syntax filesMarkus Heidelberg2009-01-121-5/+7
* | | | | | | Merge branch 'maint'Junio C Hamano2009-01-111-3/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'mh/maint-sendmail-cc-doc' into maintJunio C Hamano2009-01-111-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-do-not-switch-to-non-commit' into maintJunio C Hamano2009-01-112-1/+5
| |\ \ \ \ \ \ \
| * | | | | | | | Documentation/git-push.txt: minor: compress one optionjidanni@jidanni.org2009-01-111-3/+1
* | | | | | | | | git-svn: add --authors-file testEric Wong2009-01-111-0/+94
* | | | | | | | | Cleanup of unused symcache variable inside diff-lib.cKjetil Barvik2009-01-111-29/+11
* | | | | | | | | Makefile: clean up TEST_PROGRAMS definitionJeff King2009-01-111-1/+8
* | | | | | | | | t7501-commit.sh: explicitly check that -F prevents invoking the editorAdeodato Simó2009-01-102-4/+21
* | | | | | | | | bash completion: Use 'git add' completions for 'git stage'Lee Marlow2009-01-101-0/+1
* | | | | | | | | bash completion: Add '--intent-to-add' long option for 'git add'Lee Marlow2009-01-101-1/+1
* | | | | | | | | filter-branch: add git_commit_non_empty_tree and --prune-empty.Pierre Habouzit2009-01-103-1/+50
* | | | | | | | | Merge branch 'mh/maint-sendmail-cc-doc'Junio C Hamano2009-01-071-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | doc/git-send-email: mention sendemail.cc config variableMarkus Heidelberg2008-12-291-0/+1
* | | | | | | | | Merge branch 'rs/diff-ihc'Junio C Hamano2009-01-077-1/+106
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: add option to show context between close hunksRené Scharfe2008-12-297-1/+106
* | | | | | | | | | Merge branch 'js/maint-merge-recursive-r-d-conflict'Junio C Hamano2009-01-072-0/+28
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-242-0/+28
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mk/gitweb-feature'Junio C Hamano2009-01-071-32/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: unify boolean feature subroutinesMatt Kraai2008-12-151-32/+9
* | | | | | | | | | Merge branch 'cb/merge-recursive-fix'Junio C Hamano2009-01-072-0/+119
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixJunio C Hamano2008-12-152-0/+119
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | / / | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | merge-recursive: do not clobber untracked working tree garbageJunio C Hamano2008-12-152-1/+33
| | * | | | | | | | modify/delete conflict resolution overwrites untracked fileClemens Buchacher2008-12-151-0/+87
* | | | | | | | | | Merge branch 'kk/maint-http-push'Junio C Hamano2009-01-071-6/+19
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | http-push: support full URI in handle_remote_ls_ctx()Kirill A. Korinskiy2008-12-241-6/+19
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mv/um-pdf'Junio C Hamano2009-01-073-0/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add support for a pdf version of the user manualMiklos Vajna2008-12-103-0/+22
* | | | | | | | | | Merge branch 'jn/gitweb-blame'Junio C Hamano2009-01-071-35/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitweb: cache $parent_commit info in git_blame()Jakub Narebski2008-12-101-5/+11
| * | | | | | | | | | gitweb: A bit of code cleanup in git_blame()Jakub Narebski2008-12-101-28/+39
| * | | | | | | | | | gitweb: Move 'lineno' id from link to row element in git_blameJakub Narebski2008-12-091-2/+1
* | | | | | | | | | | Merge branch 'wp/add-p-goto'Junio C Hamano2009-01-071-0/+67
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add 'g' command to go to a hunkWilliam Pursell2008-12-041-0/+26
| * | | | | | | | | | | Add subroutine to display one-line summary of hunksWilliam Pursell2008-12-041-0/+41
* | | | | | | | | | | | strbuf: instate cleanup rule in case of non-memory errorsRené Scharfe2009-01-062-6/+22
View Lorry Controller Status