aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano2009-11-30
|\
| * builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy2009-11-29
| * merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-29
* | Merge branch 'ap/maint-merge-strategy-list-fix'Junio C Hamano2009-11-30
|\ \
| * | builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun2009-11-29
| |/
* | Merge branch 'jc/pretty-lf'Junio C Hamano2009-11-30
|\ \
| * | Pretty-format: %[+-]x to tweak inter-item newlinesJunio C Hamano2009-10-04
* | | Merge branch 'cc/bisect-doc'Junio C Hamano2009-11-30
|\ \ \
| * | | Documentation: add "Fighting regressions with git bisect" articleChristian Couder2009-11-08
* | | | Merge branch 'em/commit-claim'Junio C Hamano2009-11-30
|\ \ \ \
| * | | | commit -c/-C/--amend: reset timestamp and authorship to committer with --rese...Erick Mattos2009-11-04
* | | | | Merge branch 'jc/mailinfo-remove-brackets'Junio C Hamano2009-11-30
|\ \ \ \ \
| * | | | | mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] markerJunio C Hamano2009-07-29
* | | | | | Merge branch 'fc/send-email-envelope'Junio C Hamano2009-11-30
|\ \ \ \ \ \
| * | | | | | send-email: automatic envelope senderFelipe Contreras2009-11-27
| * | | | | | t9001: test --envelope-sender option of send-emailJunio C Hamano2009-11-22
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'uk/maint-shortlog-encoding'Junio C Hamano2009-11-30
|\ \ \ \ \ \
| * | | | | | shortlog: respect commit encodingUwe Kleine-König2009-11-25
| |/ / / / /
* | | | | | Merge branch 'ns/send-email-no-chain-reply-to'Junio C Hamano2009-11-30
|\ \ \ \ \ \
| * | | | | | prepare send-email for smoother change of --chain-reply-to defaultNanako Shiraishi2009-11-29
* | | | | | | Merge branch 'jc/maint-am-keep'Junio C Hamano2009-11-30
|\ \ \ \ \ \ \
| * | | | | | | Remove dead code from "git am"Junio C Hamano2009-11-27
* | | | | | | | Merge branch 'bw/diff-color-hunk-header'Junio C Hamano2009-11-30
|\ \ \ \ \ \ \ \
| * | | | | | | | Give the hunk comment its own colorBert Wesarg2009-11-28
| * | | | | | | | emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano2009-11-27
* | | | | | | | | t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATHMatthew Ogilvie2009-11-29
* | | | | | | | | t3409 t4107 t7406 t9150: use dashless commandsMatthew Ogilvie2009-11-29
* | | | | | | | | t2300: use documented technique to invoke git-sh-setupMatthew Ogilvie2009-11-29
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Update draft release notes to 1.6.6 before merging topics for -rc1Junio C Hamano2009-11-28
* | | | | | | | Makefile: do not clean arm directoryJonathan Nieder2009-11-28
* | | | | | | | Merge branch 'maint'Junio C Hamano2009-11-27
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2009-11-26
* | | | | | | | | Add a notice that only certain functions can print color escape codesJohannes Sixt2009-11-27
| |/ / / / / / / |/| | | | | | |
* | | | | | | | gitworkflows: Consistently back-quote git commandsBjörn Gustavsson2009-11-26
* | | | | | | | Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-25
|\ \ \ \ \ \ \ \
| * | | | | | | | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-23
| * | | | | | | | mergetool--lib: simplify guess_merge_tool()René Scharfe2009-11-23
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Explicitly truncate bswap operand to uint32_tBenjamin Kramer2009-11-25
* | | | | | | | t1200: fix a timing dependent errorNanako Shiraishi2009-11-25
* | | | | | | | Merge branch 'rj/maint-cygwin-count-objects'Junio C Hamano2009-11-24
|\ \ \ \ \ \ \ \
| * | | | | | | | git-count-objects: Fix a disk-space under-estimate on CygwinRamsay Jones2009-11-19
| |/ / / / / / /
* | | | | | | | Documentation: update descriptions of revision options related to '--bisect'Christian Couder2009-11-24
* | | | | | | | Enable support for IPv6 on MinGWMartin Storsjö2009-11-24
* | | | | | | | Refactor winsock initialization into a separate functionMartin Storsjö2009-11-24
* | | | | | | | Merge branch 'rs/color-escape-has-zero-width'Junio C Hamano2009-11-23
|\ \ \ \ \ \ \ \
| * | | | | | | | strbuf_add_wrapped_text(): skip over colour codesRené Scharfe2009-11-23
* | | | | | | | | Merge branch 'bg/apply-doc'Junio C Hamano2009-11-23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix over-simplified documentation for 'git log -z'Björn Gustavsson2009-11-23
| * | | | | | | | | apply: Use the term "working tree" consistentlyBjörn Gustavsson2009-11-22
| * | | | | | | | | apply: Format all options using back-quotesBjörn Gustavsson2009-11-22