1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Junio C Hamano
Git 1.7.2-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.2-rc0
Junio C Hamano
Merge branch 'cp/textconv-cat-file' * cp/textconv-cat-file: git-cat-file.txt: Document --textconv t/t8007: test textconv support for cat-file textconv: support for cat_file sha1_name: add get_sha1_with_context()
Junio C Hamano
Merge branch 'pb/maint-perl-errmsg-no-dir' * pb/maint-perl-errmsg-no-dir: Git.pm: better error message
Junio C Hamano
Merge branch 'tr/send-email-8bit' * tr/send-email-8bit: send-email: ask about and declare 8bit mails
Junio C Hamano
Merge branch 'js/maint-am-rebase-invalid-author' * js/maint-am-rebase-invalid-author: am: use get_author_ident_from_commit instead of mailinfo when rebasing
Junio C Hamano
Merge branch 'ab/blame-textconv' * ab/blame-textconv: t/t8006: test textconv support for blame textconv: support for blame textconv: make the API public Conflicts: diff.h
Junio C Hamano
Merge branch 'jn/show-num-walks' * jn/show-num-walks: DWIM 'git show -5' to 'git show --do-walk -5'
Junio C Hamano
Merge branch 'maint' * maint: msvc: Fix some compiler warnings Documentation: grep: fix asciidoc problem with -- msvc: Fix some "expr evaluates to function" compiler warnings
Ramsay Jones
msvc: Fix some compiler warnings In particular, using the normal (or production) compiler warning level (-W3), msvc complains as follows: .../sha1.c(244) : warning C4018: '<' : signed/unsigned mismatch .../sha1.c(270) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data .../sha1.c(271) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned lon…
Christian Couder
Documentation: grep: fix asciidoc problem with -- Asciidoc interprets two dashes separated by spaces as a single big dash. So let's escape the first dash, so that "\--" will properly appear as "--". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
git-cat-file.txt: Document --textconv Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones
msvc: Fix some "expr evaluates to function" compiler warnings In particular, the following warning is issued while compiling notes.c: notes.c(927) : warning C4550: expression evaluates to a \ function which is missing an argument list along with identical warnings on lines 928, 1016 and 1017. In order to suppress the warning, we change the definition of combine_notes_fn, so that the symbol type is an (explicit) "pointer to function ...". As a result,…
Junio C Hamano
Merge branch 'jk/url-decode' * jk/url-decode: url.c: "<scheme>://" part at the beginning should not be URL decoded
Junio C Hamano
url.c: "<scheme>://" part at the beginning should not be URL decoded When using the protocol git+ssh:// for example we do not want to decode the '+' as a space. The url decoding must take place only for the server name and parameters. This fixes a regression introduced in 9d2e942. Initial-fix-by: Pascal Obry <pascal.obry@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.7.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/maint-simpler-common-prefix' * jc/maint-simpler-common-prefix: common_prefix: simplify and fix scanning for prefixes
Junio C Hamano
Merge branch 'sb/format-patch-signature' * sb/format-patch-signature: completion: Add --signature and format.signature format-patch: Add a signature option (--signature)
Junio C Hamano
Merge branch 'mg/pretty-magic-space' * mg/pretty-magic-space: pretty: Introduce ' ' modifier to add space if non-empty Conflicts: pretty.c
Junio C Hamano
Merge branch 'jn/gitweb-return-or-exit-cleanup' * jn/gitweb-return-or-exit-cleanup: gitweb: Return or exit after done serving request Conflicts: gitweb/gitweb.perl
Junio C Hamano
Merge branch 'bd/maint-unpack-trees-parawalk-fix' * bd/maint-unpack-trees-parawalk-fix: unpack-trees: Make index lookahead less pessimal
Junio C Hamano
Merge branch 'cc/cherry-pick-series' * cc/cherry-pick-series: Documentation/revert: describe passing more than one commit Documentation/cherry-pick: describe passing more than one commit revert: add tests to check cherry-picking many commits revert: allow cherry-picking more than one commit revert: change help_msg() to take no argument revert: refactor code into a do_pick_commit() function revert: use run_command_v_opt(…
Junio C Hamano
Merge branch 'jc/rev-list-ancestry-path' * jc/rev-list-ancestry-path: revision: Turn off history simplification in --ancestry-path mode revision: Fix typo in --ancestry-path error message Documentation/rev-list-options.txt: Explain --ancestry-path Documentation/rev-list-options.txt: Fix missing line in example history graph revision: --ancestry-path
Junio C Hamano
Merge branch 'lt/extended-sha1-match-commit-with-regexp' * lt/extended-sha1-match-commit-with-regexp: Make :/ accept a regex rather than a fixed pattern
Junio C Hamano
Merge branch 'maint' * maint: Update draft release notes to 1.7.1.1 tests: remove unnecessary '^' from 'expr' regular expression Conflicts: diff.c
Junio C Hamano
Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ic/maint-rebase-i-abort' into maint * ic/maint-rebase-i-abort: rebase -i: Abort cleanly if new base cannot be checked out
Junio C Hamano
Merge branch 'cc/maint-commit-reflog-msg' into maint * cc/maint-commit-reflog-msg: commit: use value of GIT_REFLOG_ACTION env variable as reflog message
Junio C Hamano
Merge branch 'jk/maint-advice-empty-amend' into maint * jk/maint-advice-empty-amend: commit: give advice on empty amend
Junio C Hamano
Merge branch 'tc/commit-abbrev-fix' into maint * tc/commit-abbrev-fix: commit::print_summary(): don't use format_commit_message() t7502-commit: add summary output tests for empty and merge commits t7502-commit: add tests for summary output
Junio C Hamano
Merge branch 'jn/document-rebase-i-p-limitation' into maint * jn/document-rebase-i-p-limitation: rebase -i -p: document shortcomings
  1. Prev
  2. Next