summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-12-02Git 1.6.6-rc1v1.6.6-rc1Junio C Hamano2-2/+2
2009-12-02git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand1-3/+3
2009-12-02Merge branch 'maint'Junio C Hamano3-12/+43
2009-12-02Prepare for 1.6.5.4Junio C Hamano2-1/+33
2009-12-02merge: do not add standard message when message is given with -m optionJunio C Hamano2-11/+10
2009-12-02Do not misidentify "git merge foo HEAD" as an old-style invocationJunio C Hamano1-1/+1
2009-12-01Update draft release notes to 1.6.6 before -rc1Junio C Hamano1-20/+67
2009-12-01Merge branch 'maint'Junio C Hamano4-6/+6
2009-12-01Merge branch 'jc/deprecate-old-syntax-from-merge'Junio C Hamano1-0/+6
2009-12-01git-merge: a deprecation notice of the ancient command line syntaxJunio C Hamano1-0/+6
2009-12-01Merge branch 'bw/remote-get-ref-states-fix'Junio C Hamano1-2/+4
2009-12-01get_ref_states: strdup entries and free util in stale listBert Wesarg1-2/+4
2009-12-01help: Do not unnecessarily look for a repositoryDavid Aguilar1-3/+3
2009-12-01Documentation: Fix a few i.e./e.g. mix-upsMichael J Gruber2-2/+2
2009-12-01Merge branch 'jn/gitweb-blame'Junio C Hamano6-88/+1173
2009-12-01gitweb: Add link to other blame implementation in blame viewsJakub Narebski1-0/+11
2009-11-30gitweb: Make linking to actions requiring JavaScript a featureJakub Narebski1-1/+8
2009-11-30Merge branch 'fc/maint-format-patch-pathspec-dashes'Junio C Hamano2-1/+7
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano3-18/+27
2009-11-30Merge branch 'ap/maint-merge-strategy-list-fix'Junio C Hamano1-1/+1
2009-11-30Merge branch 'jc/pretty-lf'Junio C Hamano3-2/+70
2009-11-30Merge branch 'cc/bisect-doc'Junio C Hamano3-0/+1364
2009-11-30Merge branch 'em/commit-claim'Junio C Hamano3-4/+129
2009-11-30Merge branch 'jc/mailinfo-remove-brackets'Junio C Hamano2-21/+35
2009-11-30Merge branch 'fc/send-email-envelope'Junio C Hamano3-4/+41
2009-11-30Merge branch 'uk/maint-shortlog-encoding'Junio C Hamano2-8/+39
2009-11-30Merge branch 'ns/send-email-no-chain-reply-to'Junio C Hamano2-2/+66
2009-11-30Merge branch 'jc/maint-am-keep'Junio C Hamano1-5/+6
2009-11-30Merge branch 'bw/diff-color-hunk-header'Junio C Hamano5-19/+63
2009-11-30Documentation: Document --branch option in git clone synopsisDavid Soria Parra1-1/+1
2009-11-29builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy1-0/+1
2009-11-29merge-recursive: make the error-message generation an extern functionMatthieu Moy2-13/+21
2009-11-29t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATHMatthew Ogilvie1-0/+13
2009-11-29t3409 t4107 t7406 t9150: use dashless commandsMatthew Ogilvie4-16/+16
2009-11-29builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun1-1/+1
2009-11-29t2300: use documented technique to invoke git-sh-setupMatthew Ogilvie1-1/+1
2009-11-29prepare send-email for smoother change of --chain-reply-to defaultNanako Shiraishi2-2/+66
2009-11-28Update draft release notes to 1.6.6 before merging topics for -rc1Junio C Hamano1-33/+100
2009-11-28Makefile: do not clean arm directoryJonathan Nieder1-1/+1
2009-11-28Give the hunk comment its own colorBert Wesarg5-9/+52
2009-11-27send-email: automatic envelope senderFelipe Contreras3-4/+24
2009-11-27emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano2-10/+11
2009-11-27Remove dead code from "git am"Junio C Hamano1-5/+6
2009-11-27Merge branch 'maint'Junio C Hamano2-2/+20
2009-11-27Add a notice that only certain functions can print color escape codesJohannes Sixt1-0/+5
2009-11-26format-patch: add test for parsing of "--"Felipe Contreras1-0/+5
2009-11-26format-patch: fix parsing of "--" on the command lineFelipe Contreras1-1/+2
2009-11-26builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2-2/+20
2009-11-26gitworkflows: Consistently back-quote git commandsBjörn Gustavsson1-1/+1
2009-11-25shortlog: respect commit encodingUwe Kleine-König2-9/+39
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano9-25/+32
2009-11-25Explicitly truncate bswap operand to uint32_tBenjamin Kramer1-1/+1
2009-11-25gitweb.js: fix padLeftStr() and its usageStephen Boyd1-5/+5
2009-11-25gitweb.js: Harden setting blamed commit info in incremental blameJakub Narebski1-1/+6
2009-11-25t1200: fix a timing dependent errorNanako Shiraishi2-5/+9
2009-11-24Merge branch 'rj/maint-cygwin-count-objects'Junio C Hamano1-0/+1
2009-11-24Documentation: update descriptions of revision options related to '--bisect'Christian Couder1-12/+27
2009-11-24Enable support for IPv6 on MinGWMartin Storsjö3-2/+181
2009-11-24Refactor winsock initialization into a separate functionMartin Storsjö1-3/+12
2009-11-23Merge branch 'rs/color-escape-has-zero-width'Junio C Hamano2-4/+22
2009-11-23Merge branch 'bg/apply-doc'Junio C Hamano2-21/+39
2009-11-23Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano5-3/+32
2009-11-23Merge branch 'jc/log-stdin'Junio C Hamano8-34/+164
2009-11-23Merge branch 'mr/gitweb-snapshot'Junio C Hamano4-19/+234
2009-11-23t/gitweb-lib: Split HTTP response with non-GNU sedBrian Gernhardt1-2/+12
2009-11-23Merge branch 'cc/replace'Junio C Hamano6-10/+38
2009-11-23Merge branch 'maint'Junio C Hamano6-6/+26
2009-11-23pack-objects: split implications of --all-progress from progress activationNicolas Pitre4-5/+20
2009-11-23instaweb: restart server if already runningStephen Boyd1-0/+5
2009-11-23prune-packed: only show progress when stderr is a ttyJeff King1-1/+1
2009-11-23remote-curl.c: fix rpc_out()Tay Ray Chuan1-1/+1
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano8-18/+26
2009-11-23mergetool--lib: simplify guess_merge_tool()René Scharfe1-7/+6
2009-11-23strbuf_add_wrapped_text(): skip over colour codesRené Scharfe2-4/+22
2009-11-23t4014-format-patch: do not assume 'test' is available as non-builtinJohannes Sixt1-4/+2
2009-11-23Fix over-simplified documentation for 'git log -z'Björn Gustavsson1-5/+7
2009-11-23Add trivial tests for --stdin option to log familyJunio C Hamano1-0/+61
2009-11-23Merge branch 'bg/fetch-multi'Junio C Hamano13-115/+492
2009-11-22bisect: simplify calling visualizer using '--bisect' optionChristian Couder1-2/+1
2009-11-22Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POSTMartin Storsjö2-2/+2
2009-11-22config documentation: some configs are auto-set by git-initMatthew Ogilvie1-2/+22
2009-11-22cvsserver doc: database generally can not be reproduced consistentlyMatthew Ogilvie1-4/+15
2009-11-22Git v1.6.6-rc0v1.6.6-rc0Junio C Hamano1-1/+22
2009-11-22Merge branch 'maint'Junio C Hamano2-6/+0
2009-11-22Merge git://git.bogomips.org/git-svnJunio C Hamano2-0/+28
2009-11-22git svn: strip leading path when making empty dirsEric Wong2-0/+26
2009-11-22Merge branch 'th/maint-remote-update-help-string'Junio C Hamano1-1/+1
2009-11-22Merge branch 'jn/faster-completion-startup'Junio C Hamano1-35/+41
2009-11-22Merge branch 'rj/maint-t9700'Junio C Hamano1-1/+1
2009-11-22Merge branch 'ls/maint-mailinfo-no-inbody'Junio C Hamano16-5/+122
2009-11-22Merge branch 'mo/maint-crlf-doc'Junio C Hamano1-3/+4
2009-11-22Merge branch 'th/remote-usage'Junio C Hamano2-21/+52
2009-11-22Merge branch 'pb/maint-use-custom-perl'Junio C Hamano4-4/+5
2009-11-22Merge branch 'mm/config-pathname-tilde-expand'Junio C Hamano5-37/+69
2009-11-22Merge branch 'bc/grep-i-F'Junio C Hamano4-6/+27
2009-11-22Merge branch 'jk/maint-break-rename-reduce-memory'Junio C Hamano2-3/+10
2009-11-22Merge branch 'tc/format-attribute'Junio C Hamano10-3/+22
2009-11-22Merge branch 'tr/maint-merge-ours-clarification' (early part)Junio C Hamano2-5/+16
2009-11-22log --format: document %wRené Scharfe1-0/+4
2009-11-22strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()René Scharfe2-9/+38
2009-11-22grep: unset GREP_OPTIONS before spawning external grepRené Scharfe2-0/+9
2009-11-22User Manual: Write "Git" instead of "GIT"Björn Gustavsson1-2/+2
2009-11-22Fix truncated usage messagesBjörn Gustavsson1-1/+1
2009-11-22user-manual: Document that "git merge" doesn't like uncommited changes.Matthieu Moy1-2/+18
2009-11-22merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy4-1/+14
2009-11-22git svn: always reuse existing remotes on fetchEric Wong1-0/+2
2009-11-22t9001: test --envelope-sender option of send-emailJunio C Hamano1-0/+17
2009-11-22apply: Use the term "working tree" consistentlyBjörn Gustavsson1-2/+2
2009-11-22apply: Format all options using back-quotesBjörn Gustavsson1-8/+8
2009-11-22apply: apply works outside a repositoryBjörn Gustavsson1-3/+6
2009-11-22Clarify and correct -zBjörn Gustavsson2-8/+21
2009-11-21Documentation: avoid xmlto input errorJunio C Hamano1-3/+3
2009-11-20Merge branch 'jc/fix-tree-walk' (early part)Junio C Hamano2-14/+14
2009-11-20Merge branch 'jh/notes' (early part)Junio C Hamano20-10/+1408
2009-11-20Merge branch 'sp/smart-http'Junio C Hamano35-283/+2937
2009-11-20Merge branch 'bw/autoconf-more'Junio C Hamano1-0/+43
2009-11-20Merge branch 'jn/editor-pager'Junio C Hamano19-69/+178
2009-11-20Merge branch 'rj/cygwin-msvc'Junio C Hamano4-16/+21
2009-11-20Merge branch 'rj/maint-simplify-cygwin-makefile'Junio C Hamano1-4/+2
2009-11-20Merge branch 'bg/format-patch-doc-update'Junio C Hamano4-50/+99
2009-11-20Merge branch 'tr/filter-branch'Junio C Hamano3-13/+58
2009-11-20Merge branch 'sc/protocol-doc'Junio C Hamano3-41/+777
2009-11-20Merge branch 'jl/submodule-add-noname'Junio C Hamano3-3/+28
2009-11-20Merge branch 'sb/ls-tree-parseopt'Junio C Hamano2-62/+127
2009-11-20Merge branch 'rg/doc-workflow'Junio C Hamano1-0/+115
2009-11-20Merge branch 'jn/gitweb-log-history'Junio C Hamano1-159/+110
2009-11-20Merge branch 'jn/help-everywhere'Junio C Hamano32-41/+147
2009-11-20Merge branch 'jp/fetch-cull-many-refs'Junio C Hamano3-22/+49
2009-11-20Add branch management for releases to gitworkflowsRaman Gupta1-0/+115
2009-11-20git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström16-5/+122
2009-11-20git remote: Separate usage strings for subcommandsTim Henigan2-21/+52
2009-11-20diffcore-rename: reduce memory footprint by freeing blob data earlyJunio C Hamano1-2/+5
2009-11-20Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTSChristian Couder1-0/+3
2009-11-20Documentation: fix typos and spelling in replace documentationChristian Couder1-10/+11
2009-11-20replace: use a GIT_NO_REPLACE_OBJECTS env variableChristian Couder5-0/+24
2009-11-20describe: do not use unannotated tag even if exact matchThomas Rast2-1/+7
2009-11-20submodule.c: Squelch a "use before assignment" warningDavid Aguilar1-1/+1
2009-11-20Make --stdin option to "log" family read also pathspecsJunio C Hamano2-5/+71
2009-11-20setup_revisions(): do not call get_pathspec() too earlyJunio C Hamano1-3/+6
2009-11-20Teach --stdin option to "log" familyJunio C Hamano7-22/+20
2009-11-20read_revision_from_stdin(): use strbufJunio C Hamano1-8/+10
2009-11-19git-count-objects: Fix a disk-space under-estimate on CygwinRamsay Jones1-0/+1
2009-11-19Documentation: undocument gc'd function graph_release()Greg Price2-6/+0
2009-11-19gitweb.js: fix null object exception in initials calculationStephen Boyd1-2/+5
2009-11-19t9700-perl-git.sh: Fix a test failure on CygwinRamsay Jones1-1/+1
2009-11-19expand_user_path: expand ~ to $HOME, not to the actual homedir.Matthieu Moy2-8/+14
2009-11-17Merge branch 'np/maint-sideband-favor-status'Junio C Hamano2-23/+23
2009-11-17Merge branch 'sb/tutorial-test'Junio C Hamano2-71/+169
2009-11-17Merge branch 'ef/msys-imap'Junio C Hamano5-180/+81
2009-11-17ls-tree: migrate to parse-optionsStephen Boyd1-60/+40
2009-11-17Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy5-37/+63
2009-11-17Speed up bash completion loadingJonathan Nieder1-35/+41
2009-11-17Merge git://git.bogomips.org/git-svnJunio C Hamano8-65/+545
2009-11-17Make sure $PERL_PATH is defined when the test suite is run.Philippe Bruhat (BooK)4-4/+5
2009-11-16Document git-svn's first-parent ruleThomas Rast1-0/+10
2009-11-16core.autocrlf documentation: mention the crlf attributeMatthew Ogilvie1-3/+4
2009-11-16rebase docs: clarify --merge and --strategyThomas Rast1-3/+13
2009-11-16t3101: test more ls-tree optionsStephen Boyd1-2/+87
2009-11-16grep: Allow case insensitive search of fixed-stringsBrian Collins4-6/+27
2009-11-16diffcore-break: save cnt_data for other phasesJeff King1-3/+3
2009-11-16diffcore-break: free filespec data as we goJeff King1-0/+4
2009-11-16Update draft release notes to 1.6.6Junio C Hamano1-27/+27
2009-11-16Sync with 1.6.5.3Junio C Hamano3-2/+69
2009-11-16Git 1.6.5.3v1.6.5.3Junio C Hamano4-3/+67
2009-11-16Merge branch 'bs/maint-pre-commit-hook-sample' into maintJunio C Hamano1-9/+9
2009-11-16Merge branch 'jk/maint-add-p-empty' into maintJunio C Hamano2-5/+30
2009-11-16Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano2-8/+32
2009-11-15Merge branch 'tz/maint-rpm' into maintJunio C Hamano1-1/+4
2009-11-15Merge branch 'jk/maint-format-patch-p-suppress-stat' into maintJunio C Hamano2-2/+28
2009-11-15Merge branch 'pb/maint-gitweb-blob-lineno' into maintJunio C Hamano1-1/+2
2009-11-15Merge branch 'jk/maint-1.6.3-ls-files-i' into maintJunio C Hamano3-2/+20
2009-11-15Merge branch 'vl/maint-openssl-signature-change' into maintJunio C Hamano1-0/+4
2009-11-15Merge branch 'jk/maint-push-config' into maintJunio C Hamano1-2/+1
2009-11-15Merge branch 'sr/blame-incomplete' into maintJunio C Hamano1-0/+6
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano8-173/+437
2009-11-15http-backend: Let gcc check the format of more printf-type functions.Tarmigan Casebolt1-0/+3
2009-11-15http-backend: Fix access beyond end of string.Tarmigan Casebolt1-3/+4
2009-11-15git svn: attempt to create empty dirs on clone+rebaseEric Wong4-2/+139
2009-11-15Check the format of more printf-type functionsTarmigan Casebolt10-3/+22
2009-11-15Merge branch 'maint'Junio C Hamano0-0/+0
2009-11-15Merge branch 'bs/maint-pre-commit-hook-sample'Junio C Hamano1-9/+9
2009-11-15Merge branch 'js/maint-diff-color-words'Junio C Hamano2-8/+32
2009-11-15Merge branch 'rs/pretty-wrap'Junio C Hamano1-0/+57
2009-11-15Merge branch 'js/log-rewrap'Junio C Hamano2-9/+53
2009-11-15Merge branch 'fc/doc-fast-forward'Junio C Hamano35-73/+73
2009-11-15Merge branch 'sc/difftool-p4merge'Junio C Hamano5-6/+19
2009-11-15Merge branch 'jk/maint-add-p-empty'Junio C Hamano2-5/+30
2009-11-15Merge branch 'lt/revision-bisect'Junio C Hamano4-1/+32
2009-11-15Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maintJunio C Hamano1-2/+2
2009-11-15Merge branch 'tr/maint-roff-quote' into maintJunio C Hamano3-0/+28
2009-11-15Merge branch 'ja/fetch-doc' into maintJunio C Hamano3-67/+76
2009-11-15Merge branch 'cb/doc-fetch-pull-merge' into maintJunio C Hamano3-45/+66
2009-11-15Merge branch 'jk/maint-cvsimport-pathname' into maintJunio C Hamano1-3/+14
2009-11-15Merge branch 'jc/receive-pack-auto' into maintJunio C Hamano3-4/+36
2009-11-15Merge branch 'gb/maint-gitweb-esc-param' into maintJunio C Hamano1-2/+1
2009-11-15Merge branch 'jn/gitweb-patch' into maintJunio C Hamano1-3/+3
2009-11-15Documentation: clarify 'ours' merge strategyThomas Rast1-2/+3
2009-11-15Update 'git remote update' usage string to match man page.Tim Henigan1-1/+1
2009-11-15Merge branch 'maint'Junio C Hamano1-4/+4
2009-11-14remote: fix use-after-free error detected by glibc in ref_remove_duplicatesJulian Phillips2-0/+13
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 16:47:52 +0000