summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'uk/maint-shortlog-encoding'Junio C Hamano2009-11-302-8/+39
|\
| * shortlog: respect commit encodingUwe Kleine-König2009-11-262-9/+39
* | Merge branch 'ns/send-email-no-chain-reply-to'Junio C Hamano2009-11-302-2/+66
|\ \
| * | prepare send-email for smoother change of --chain-reply-to defaultNanako Shiraishi2009-11-292-2/+66
* | | Merge branch 'jc/maint-am-keep'Junio C Hamano2009-11-301-5/+6
|\ \ \
| * | | Remove dead code from "git am"Junio C Hamano2009-11-281-5/+6
* | | | Merge branch 'bw/diff-color-hunk-header'Junio C Hamano2009-11-305-19/+63
|\ \ \ \
| * | | | Give the hunk comment its own colorBert Wesarg2009-11-285-9/+52
| * | | | emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano2009-11-282-10/+11
* | | | | t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATHMatthew Ogilvie2009-11-301-0/+13
* | | | | t3409 t4107 t7406 t9150: use dashless commandsMatthew Ogilvie2009-11-304-16/+16
* | | | | t2300: use documented technique to invoke git-sh-setupMatthew Ogilvie2009-11-301-1/+1
| |_|/ / |/| | |
* | | | Update draft release notes to 1.6.6 before merging topics for -rc1Junio C Hamano2009-11-281-33/+100
* | | | Makefile: do not clean arm directoryJonathan Nieder2009-11-281-1/+1
* | | | Merge branch 'maint'Junio C Hamano2009-11-272-2/+20
|\ \ \ \
| * | | | builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2009-11-272-2/+20
* | | | | Add a notice that only certain functions can print color escape codesJohannes Sixt2009-11-271-0/+5
| |/ / / |/| | |
* | | | gitworkflows: Consistently back-quote git commandsBjörn Gustavsson2009-11-271-1/+1
* | | | Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-259-25/+32
|\ \ \ \
| * | | | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-248-18/+26
| * | | | mergetool--lib: simplify guess_merge_tool()René Scharfe2009-11-241-7/+6
| | |_|/ | |/| |
* | | | Explicitly truncate bswap operand to uint32_tBenjamin Kramer2009-11-251-1/+1
* | | | t1200: fix a timing dependent errorNanako Shiraishi2009-11-252-5/+9
* | | | Merge branch 'rj/maint-cygwin-count-objects'Junio C Hamano2009-11-251-0/+1
|\ \ \ \
| * | | | git-count-objects: Fix a disk-space under-estimate on CygwinRamsay Jones2009-11-201-0/+1
| |/ / /
* | | | Documentation: update descriptions of revision options related to '--bisect'Christian Couder2009-11-241-12/+27
* | | | Enable support for IPv6 on MinGWMartin Storsjö2009-11-243-2/+181
* | | | Refactor winsock initialization into a separate functionMartin Storsjö2009-11-241-3/+12
* | | | Merge branch 'rs/color-escape-has-zero-width'Junio C Hamano2009-11-242-4/+22
|\ \ \ \
| * | | | strbuf_add_wrapped_text(): skip over colour codesRené Scharfe2009-11-242-4/+22
* | | | | Merge branch 'bg/apply-doc'Junio C Hamano2009-11-242-21/+39
|\ \ \ \ \
| * | | | | Fix over-simplified documentation for 'git log -z'Björn Gustavsson2009-11-231-5/+7
| * | | | | apply: Use the term "working tree" consistentlyBjörn Gustavsson2009-11-221-2/+2
| * | | | | apply: Format all options using back-quotesBjörn Gustavsson2009-11-221-8/+8
| * | | | | apply: apply works outside a repositoryBjörn Gustavsson2009-11-221-3/+6
| * | | | | Clarify and correct -zBjörn Gustavsson2009-11-222-8/+21
* | | | | | Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano2009-11-245-3/+32
|\ \ \ \ \ \
| * | | | | | user-manual: Document that "git merge" doesn't like uncommited changes.Matthieu Moy2009-11-231-2/+18
| * | | | | | merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-234-1/+14
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jc/log-stdin'Junio C Hamano2009-11-248-34/+164
|\ \ \ \ \ \
| * | | | | | Add trivial tests for --stdin option to log familyJunio C Hamano2009-11-231-0/+61
| * | | | | | Make --stdin option to "log" family read also pathspecsJunio C Hamano2009-11-212-5/+71
| * | | | | | setup_revisions(): do not call get_pathspec() too earlyJunio C Hamano2009-11-211-3/+6
| * | | | | | Teach --stdin option to "log" familyJunio C Hamano2009-11-217-22/+20
| * | | | | | read_revision_from_stdin(): use strbufJunio C Hamano2009-11-201-8/+10
* | | | | | | Merge branch 'mr/gitweb-snapshot'Junio C Hamano2009-11-244-19/+234
|\ \ \ \ \ \ \
| * | | | | | | t/gitweb-lib: Split HTTP response with non-GNU sedBrian Gernhardt2009-11-241-2/+12
| * | | | | | | gitweb: Smarter snapshot namesMark Rada2009-11-092-21/+93
| * | | | | | | gitweb: Document current snapshot rules via new testsJakub Narebski2009-11-091-0/+87
| * | | | | | | t/gitweb-lib.sh: Split gitweb output into headers and bodyJakub Narebski2009-10-311-1/+5