summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ap/maint-merge-strategy-list-fix'Junio C Hamano2009-11-301-1/+1
|\
| * builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun2009-11-291-1/+1
* | Merge branch 'jc/pretty-lf'Junio C Hamano2009-11-303-2/+70
|\ \
| * | Pretty-format: %[+-]x to tweak inter-item newlinesJunio C Hamano2009-10-043-2/+70
* | | Merge branch 'cc/bisect-doc'Junio C Hamano2009-11-303-0/+1364
|\ \ \
| * | | Documentation: add "Fighting regressions with git bisect" articleChristian Couder2009-11-083-0/+1364
* | | | Merge branch 'em/commit-claim'Junio C Hamano2009-11-303-4/+129
|\ \ \ \
| * | | | commit -c/-C/--amend: reset timestamp and authorship to committer with --rese...Erick Mattos2009-11-043-4/+129
* | | | | Merge branch 'jc/mailinfo-remove-brackets'Junio C Hamano2009-11-302-21/+35
|\ \ \ \ \
| * | | | | mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] markerJunio C Hamano2009-07-292-21/+35
* | | | | | Merge branch 'fc/send-email-envelope'Junio C Hamano2009-11-303-4/+41
|\ \ \ \ \ \
| * | | | | | send-email: automatic envelope senderFelipe Contreras2009-11-273-4/+24
| * | | | | | t9001: test --envelope-sender option of send-emailJunio C Hamano2009-11-221-0/+17
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'uk/maint-shortlog-encoding'Junio C Hamano2009-11-302-8/+39
|\ \ \ \ \ \
| * | | | | | shortlog: respect commit encodingUwe Kleine-König2009-11-252-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-271-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-272-10/+11
* | | | | | | | | t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATHMatthew Ogilvie2009-11-291-0/+13
* | | | | | | | | t3409 t4107 t7406 t9150: use dashless commandsMatthew Ogilvie2009-11-294-16/+16
* | | | | | | | | t2300: use documented technique to invoke git-sh-setupMatthew Ogilvie2009-11-291-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-262-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-261-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-238-18/+26
| * | | | | | | | mergetool--lib: simplify guess_merge_tool()René Scharfe2009-11-231-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-241-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | git-count-objects: Fix a disk-space under-estimate on CygwinRamsay Jones2009-11-191-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-232-4/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | strbuf_add_wrapped_text(): skip over colour codesRené Scharfe2009-11-232-4/+22
* | | | | | | | | Merge branch 'bg/apply-doc'Junio C Hamano2009-11-232-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-235-3/+32
|\ \ \ \ \ \ \ \ \ \