summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Libravatar Junio C Hamano3-18/+27
2009-11-30Merge branch 'ap/maint-merge-strategy-list-fix'Libravatar Junio C Hamano1-1/+1
2009-11-30Merge branch 'jc/pretty-lf'Libravatar Junio C Hamano3-2/+70
2009-11-30Merge branch 'cc/bisect-doc'Libravatar Junio C Hamano3-0/+1364
2009-11-30Merge branch 'em/commit-claim'Libravatar Junio C Hamano3-4/+129
2009-11-30Merge branch 'jc/mailinfo-remove-brackets'Libravatar Junio C Hamano2-21/+35
2009-11-30Merge branch 'fc/send-email-envelope'Libravatar Junio C Hamano3-4/+41
2009-11-30Merge branch 'uk/maint-shortlog-encoding'Libravatar Junio C Hamano2-8/+39
2009-11-30Merge branch 'ns/send-email-no-chain-reply-to'Libravatar Junio C Hamano2-2/+66
2009-11-30Merge branch 'jc/maint-am-keep'Libravatar Junio C Hamano1-5/+6
2009-11-30Merge branch 'bw/diff-color-hunk-header'Libravatar Junio C Hamano5-19/+63
2009-11-30Documentation: Document --branch option in git clone synopsisLibravatar David Soria Parra1-1/+1
2009-11-29builtin-merge: show user-friendly error messages for fast-forward too.Libravatar Matthieu Moy1-0/+1
2009-11-29merge-recursive: make the error-message generation an extern functionLibravatar Matthieu Moy2-13/+21
2009-11-29t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATHLibravatar Matthew Ogilvie1-0/+13
2009-11-29t3409 t4107 t7406 t9150: use dashless commandsLibravatar Matthew Ogilvie4-16/+16
2009-11-29builtin-merge.c: call exclude_cmds() correctly.Libravatar Avery Pennarun1-1/+1
2009-11-29t2300: use documented technique to invoke git-sh-setupLibravatar Matthew Ogilvie1-1/+1
2009-11-29prepare send-email for smoother change of --chain-reply-to defaultLibravatar Nanako Shiraishi2-2/+66
2009-11-28Update draft release notes to 1.6.6 before merging topics for -rc1Libravatar Junio C Hamano1-33/+100
2009-11-28Makefile: do not clean arm directoryLibravatar Jonathan Nieder1-1/+1
2009-11-28Give the hunk comment its own colorLibravatar Bert Wesarg5-9/+52
2009-11-27send-email: automatic envelope senderLibravatar Felipe Contreras3-4/+24
2009-11-27emit_line(): don't emit an empty <SET><RESET> followed by a newlineLibravatar Junio C Hamano2-10/+11
2009-11-27Remove dead code from "git am"Libravatar Junio C Hamano1-5/+6
2009-11-27Merge branch 'maint'Libravatar Junio C Hamano2-2/+20
2009-11-27Add a notice that only certain functions can print color escape codesLibravatar Johannes Sixt1-0/+5
2009-11-26format-patch: add test for parsing of "--"Libravatar Felipe Contreras1-0/+5
2009-11-26format-patch: fix parsing of "--" on the command lineLibravatar Felipe Contreras1-1/+2
2009-11-26builtin-apply.c: pay attention to -p<n> when determining the nameLibravatar Junio C Hamano2-2/+20
2009-11-26gitworkflows: Consistently back-quote git commandsLibravatar Björn Gustavsson1-1/+1
2009-11-25shortlog: respect commit encodingLibravatar Uwe Kleine-König2-9/+39
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Libravatar Junio C Hamano9-25/+32
2009-11-25Explicitly truncate bswap operand to uint32_tLibravatar Benjamin Kramer1-1/+1
2009-11-25gitweb.js: fix padLeftStr() and its usageLibravatar Stephen Boyd1-5/+5
2009-11-25gitweb.js: Harden setting blamed commit info in incremental blameLibravatar Jakub Narebski1-1/+6
2009-11-25t1200: fix a timing dependent errorLibravatar Nanako Shiraishi2-5/+9
2009-11-24Merge branch 'rj/maint-cygwin-count-objects'Libravatar Junio C Hamano1-0/+1
2009-11-24Documentation: update descriptions of revision options related to '--bisect'Libravatar Christian Couder1-12/+27
2009-11-24Enable support for IPv6 on MinGWLibravatar Martin Storsjö3-2/+181
2009-11-24Refactor winsock initialization into a separate functionLibravatar Martin Storsjö1-3/+12
2009-11-23Merge branch 'rs/color-escape-has-zero-width'Libravatar Junio C Hamano2-4/+22
2009-11-23Merge branch 'bg/apply-doc'Libravatar Junio C Hamano2-21/+39
2009-11-23Merge branch 'mm/maint-hint-failed-merge'Libravatar Junio C Hamano5-3/+32
2009-11-23Merge branch 'jc/log-stdin'Libravatar Junio C Hamano8-34/+164
2009-11-23Merge branch 'mr/gitweb-snapshot'Libravatar Junio C Hamano4-19/+234
2009-11-23t/gitweb-lib: Split HTTP response with non-GNU sedLibravatar Brian Gernhardt1-2/+12
2009-11-23Merge branch 'cc/replace'Libravatar Junio C Hamano6-10/+38
2009-11-23Merge branch 'maint'Libravatar Junio C Hamano6-6/+26
2009-11-23pack-objects: split implications of --all-progress from progress activationLibravatar Nicolas Pitre4-5/+20