summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-04-19Merge branch 'rt/commentchar-fmt-merge-msg'Libravatar Junio C Hamano1-3/+3
2013-04-19Merge branch 'mv/sequencer-pick-error-diag'Libravatar Junio C Hamano2-0/+24
2013-04-19Merge branch 'tr/copy-revisions-from-stdin'Libravatar Junio C Hamano1-1/+2
2013-04-19Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)Libravatar Junio C Hamano2-40/+95
2013-04-19Merge branch 'ap/strbuf-humanize'Libravatar Junio C Hamano6-40/+86
2013-04-19Merge branch 'fc/branch-upstream-color'Libravatar Junio C Hamano2-9/+30
2013-04-19Merge branch 'mv/ssl-ftp-curl'Libravatar Junio C Hamano3-0/+27
2013-04-18pretty: support %>> that steal trailing spacesLibravatar Nguyễn Thái Ngọc Duy5-2/+54
2013-04-18pretty: support truncating in %>, %< and %><Libravatar Nguyễn Thái Ngọc Duy5-5/+140
2013-04-18pretty: support padding placeholders, %< %> and %><Libravatar Nguyễn Thái Ngọc Duy3-1/+246
2013-04-18pretty: add %C(auto) for auto-coloringLibravatar Nguyễn Thái Ngọc Duy2-4/+25
2013-04-18pretty: split color parsing into a separate functionLibravatar Nguyễn Thái Ngọc Duy1-32/+39
2013-04-18pretty: two phase conversion for non utf-8 commitsLibravatar Nguyễn Thái Ngọc Duy2-8/+28
2013-04-18utf8.c: add reencode_string_len() that can handle NULs in stringLibravatar Nguyễn Thái Ngọc Duy3-7/+24
2013-04-18utf8.c: add utf8_strnwidth() with the ability to skip ansi sequencesLibravatar Nguyễn Thái Ngọc Duy2-6/+15
2013-04-18utf8.c: move display_mode_esc_sequence_len() for use by other functionsLibravatar Nguyễn Thái Ngọc Duy1-14/+14
2013-04-18pretty: share code between format_decoration and show_decorationsLibravatar Nguyễn Thái Ngọc Duy4-38/+39
2013-04-18pretty-formats.txt: wrap long linesLibravatar Nguyễn Thái Ngọc Duy1-6/+12
2013-04-18pretty: get the correct encoding for --pretty:format=%eLibravatar Nguyễn Thái Ngọc Duy1-6/+7
2013-04-18pretty: save commit encoding from logmsg_reencode if the caller needs itLibravatar Nguyễn Thái Ngọc Duy5-7/+16
2013-04-18Update draft release notes to 1.8.3Libravatar Junio C Hamano1-1/+25
2013-04-18Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2013-04-18Merge branch 'jk/test-trash'Libravatar Junio C Hamano1-9/+9
2013-04-18Merge branch 'th/t9903-symlinked-workdir'Libravatar Junio C Hamano1-5/+5
2013-04-18Merge branch 'jk/merge-tree-added-identically'Libravatar Junio C Hamano2-23/+13
2013-04-18Merge branch 'jk/http-dumb-namespaces'Libravatar Junio C Hamano3-4/+63
2013-04-18Merge branch 'rs/empty-archive'Libravatar Junio C Hamano1-1/+1
2013-04-18Merge branch 'fc/send-email-annotate'Libravatar Junio C Hamano7-90/+136
2013-04-18Merge branch 'jc/push-2.0-default-to-simple' (early part)Libravatar Junio C Hamano12-16/+24
2013-04-18Merge branch 'jk/daemon-user-doc'Libravatar Junio C Hamano1-0/+7
2013-04-18Merge branch 'fc/completion'Libravatar Junio C Hamano2-47/+96
2013-04-18Merge branch 'kb/co-orphan-suggestion-short-sha1'Libravatar Junio C Hamano1-1/+1
2013-04-18Merge branch 'jc/detached-head-doc'Libravatar Junio C Hamano1-3/+16
2013-04-18Merge branch 'tr/packed-object-info-wo-recursion'Libravatar Junio C Hamano1-145/+266
2013-04-18Merge branch 'jk/http-error-messages'Libravatar Junio C Hamano1-1/+1
2013-04-18t6200: avoid path mangling issue on WindowsLibravatar Johannes Sixt1-3/+3
2013-04-17remote-hg: fix commit messagesLibravatar Felipe Contreras1-1/+2
2013-04-17git add: rework the logic to warn "git add <pathspec>..." default changeLibravatar Junio C Hamano1-26/+38
2013-04-17gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibilityLibravatar Jonathan Nieder1-0/+7
2013-04-17blame: handle broken commit headers gracefullyLibravatar René Scharfe1-3/+8
2013-04-17pretty: handle broken commit headers gracefullyLibravatar René Scharfe2-21/+66
2013-04-17cat-file: print tags raw for "cat-file -p"Libravatar Jeff King2-75/+1
2013-04-17convert.c: remove duplicate codeLibravatar Lukas Fleischer1-25/+2
2013-04-17read_blob_data_from_index(): optionally return the size of blob dataLibravatar Lukas Fleischer3-4/+6
2013-04-17attr.c: extract read_index_data() as read_blob_data_from_index()Libravatar Lukas Fleischer3-34/+35
2013-04-16Merge branch 'maint'Libravatar Junio C Hamano1-0/+4
2013-04-16run-command: use thread-aware die_is_recursing routineLibravatar Jeff King1-0/+11
2013-04-16usage: allow pluggable die-recursion checksLibravatar Jeff King2-6/+15
2013-04-16help.c: add a compatibility comment to cmd_version()Libravatar David Aguilar1-0/+4
2013-04-16convert: The native line-ending is \r\n on MinGWLibravatar Jonathan Nieder1-0/+1