summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'mo/maint-crlf-doc'Junio C Hamano2009-11-231-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | core.autocrlf documentation: mention the crlf attributeMatthew Ogilvie2009-11-171-3/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'th/remote-usage'Junio C Hamano2009-11-232-21/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | git remote: Separate usage strings for subcommandsTim Henigan2009-11-212-21/+52
| |/ / / / / / /
* | | | | | | | Merge branch 'pb/maint-use-custom-perl'Junio C Hamano2009-11-234-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Make sure $PERL_PATH is defined when the test suite is run.Philippe Bruhat (BooK)2009-11-174-4/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'mm/config-pathname-tilde-expand'Junio C Hamano2009-11-235-37/+69
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: avoid xmlto input errorJunio C Hamano2009-11-211-3/+3
| * | | | | | | | expand_user_path: expand ~ to $HOME, not to the actual homedir.Matthieu Moy2009-11-192-8/+14
| * | | | | | | | Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy2009-11-185-37/+63
| |/ / / / / / /
* | | | | | | | Merge branch 'bc/grep-i-F'Junio C Hamano2009-11-234-6/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: Allow case insensitive search of fixed-stringsBrian Collins2009-11-174-6/+27
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/maint-break-rename-reduce-memory'Junio C Hamano2009-11-232-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | diffcore-rename: reduce memory footprint by freeing blob data earlyJunio C Hamano2009-11-211-2/+5
| * | | | | | | | diffcore-break: save cnt_data for other phasesJeff King2009-11-161-3/+3
| * | | | | | | | diffcore-break: free filespec data as we goJeff King2009-11-161-0/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'tc/format-attribute'Junio C Hamano2009-11-2310-3/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Check the format of more printf-type functionsTarmigan Casebolt2009-11-1610-3/+22
* | | | | | | | | Merge branch 'tr/maint-merge-ours-clarification' (early part)Junio C Hamano2009-11-232-5/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase docs: clarify --merge and --strategyThomas Rast2009-11-171-3/+13
| * | | | | | | | | Documentation: clarify 'ours' merge strategyThomas Rast2009-11-151-2/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | log --format: document %wRené Scharfe2009-11-231-0/+4
* | | | | | | | | strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()René Scharfe2009-11-232-9/+38
* | | | | | | | | grep: unset GREP_OPTIONS before spawning external grepRené Scharfe2009-11-232-0/+9
* | | | | | | | | User Manual: Write "Git" instead of "GIT"Björn Gustavsson2009-11-231-2/+2
* | | | | | | | | Fix truncated usage messagesBjörn Gustavsson2009-11-231-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'jc/fix-tree-walk' (early part)Junio C Hamano2009-11-212-14/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | unpack_callback(): use unpack_failed() consistentlyJunio C Hamano2009-10-121-12/+12
| * | | | | | | | unpack-trees: typofixJunio C Hamano2009-10-121-1/+1
| * | | | | | | | diff-lib.c: fix misleading comments on oneway_diff()Junio C Hamano2009-10-121-1/+1
* | | | | | | | | Merge branch 'jh/notes' (early part)Junio C Hamano2009-11-2120-10/+1408
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add selftests verifying concatenation of multiple notes for the same commitJohan Herland2009-10-201-0/+84
| * | | | | | | | | Refactor notes code to concatenate multiple notes annotating the same objectJohan Herland2009-10-201-82/+161
| * | | | | | | | | Add selftests verifying that we can parse notes trees with various fanoutsJohan Herland2009-10-201-0/+104
| * | | | | | | | | Teach the notes lookup code to parse notes trees with various fanout schemesJohan Herland2009-10-201-69/+248
| * | | | | | | | | Teach notes code to free its internal data structures on requestJohan Herland2009-10-202-0/+10
| * | | | | | | | | Add '%N'-format for pretty-printing commit notesJohannes Schindelin2009-10-202-0/+5
| * | | | | | | | | Add flags to get_commit_notes() to control the format of the note stringJohan Herland2009-10-203-5/+11
| * | | | | | | | | t3302-notes-index-expensive: Speed up create_repo()Johan Herland2009-10-201-27/+47
| * | | | | | | | | fast-import: Add support for importing commit notesJohan Herland2009-10-203-10/+289
| * | | | | | | | | Teach "-m <msg>" and "-F <file>" to "git notes edit"Johan Herland2009-10-203-9/+107
| * | | | | | | | | Add an expensive test for git-notesJohannes Schindelin2009-10-201-0/+98
| * | | | | | | | | Speed up git notes lookupJohannes Schindelin2009-10-201-10/+102
| * | | | | | | | | Add a script to edit/inspect notesJohannes Schindelin2009-10-206-0/+236
| * | | | | | | | | Introduce commit notesJohannes Schindelin2009-10-209-0/+108
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sp/smart-http'Junio C Hamano2009-11-2135-283/+2937
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http-backend: Let gcc check the format of more printf-type functions.Tarmigan Casebolt2009-11-161-0/+3
| * | | | | | | | | http-backend: Fix access beyond end of string.Tarmigan Casebolt2009-11-161-3/+4
| * | | | | | | | | http-backend: Fix bad treatment of uintmax_t in Content-LengthShawn O. Pearce2009-11-131-6/+3
| * | | | | | | | | t5551-http-fetch: Work around broken Accept header in libcurlShawn O. Pearce2009-11-101-0/+3