Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.2-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.2-rc1
Junio C Hamano
git.spec.in: Add gitweb subpackage Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ar/decorate-color' * ar/decorate-color: Add test for correct coloring of git log --decoration Allow customizable commit decorations colors log --decorate: Colorize commit decorations log-tree.c: Use struct name_decoration's type for classifying decoration commit.h: add 'type' to struct name_decoration
Junio C Hamano
Merge branch 'mg/doc-rev-parse-treepath-syntax' * mg/doc-rev-parse-treepath-syntax: git-rev-parse.txt: Add more examples for caret and colon git-rev-parse.txt: Document ":path" specifier
Junio C Hamano
Merge branch 'cc/cherry-pick-stdin' * cc/cherry-pick-stdin: revert: do not rebuild argv on heap revert: accept arbitrary rev-list options t3508 (cherry-pick): futureproof against unmerged files
Junio C Hamano
Merge branch 'jl/status-ignore-submodules' * jl/status-ignore-submodules: Add the option "--ignore-submodules" to "git status" git submodule: ignore dirty submodules for summary and status Conflicts: builtin/commit.c t/t7508-status.sh wt-status.c wt-status.h
Junio C Hamano
Merge branch 'jk/url-decode' * jk/url-decode: url_decode: URL scheme ends with a colon and does not require a slash
Junio C Hamano
Merge branch 'jn/grep-open' * jn/grep-open: t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script t/t7811-grep-open.sh: ensure fake "less" is made executable t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression grep -O: allow optional argument specifying the pager (or editor) grep: Add the option '--open-files-in-pager' Unify code paths of threaded greps grep: refactor gr…
Junio C Hamano
Merge branch 'jp/string-list-api-cleanup' * jp/string-list-api-cleanup: string_list: Fix argument order for string_list_append string_list: Fix argument order for string_list_lookup string_list: Fix argument order for string_list_insert_at_index string_list: Fix argument order for string_list_insert string_list: Fix argument order for for_each_string_list string_list: Fix argument order for print_string_list
Junio C Hamano
Merge branch 'tr/rev-list-count' * tr/rev-list-count: bash completion: Support "divergence from upstream" messages in __git_ps1 rev-list: introduce --count option Conflicts: contrib/completion/git-completion.bash
Junio C Hamano
Merge branch 'as/maint-completion-set-u-fix' * as/maint-completion-set-u-fix: bash-completion: Fix __git_ps1 to work with "set -u"
Junio C Hamano
Merge branch 'mg/rev-parse-tests' * mg/rev-parse-tests: t6018: make sure all tested symbolic names are different revs t6018: add tests for rev-list's --branches and --tags
Junio C Hamano
Merge branch 'jl/maint-diff-ignore-submodules' * jl/maint-diff-ignore-submodules: t4027,4041: Use test -s to test for an empty file Add optional parameters to the diff option "--ignore-submodules" git diff: rename test that had a conflicting name
Nazri Ramliy
Add test for correct coloring of git log --decoration Signed-off-by: Nazri Ramliy <ayiehere@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder
revert: do not rebuild argv on heap Set options in struct rev_info directly so we can reuse the arguments collected from parse_options without modification. This is just a cleanup; no noticeable change is intended. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin * commit 'v1.7.2-rc0~6^2': DWIM 'git show -5' to 'git show --do-walk -5' Documentation/SubmittingPatches: Fix typo in GMail section Documentation/config: describe status.submodulesummary This commit fixes one test in t3508 by making "cherry-pick -<num>" walk the history. A test update from Elijah Newren is squashed as an evil merge.
Junio C Hamano
Git 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.1.1
Brandon Casey
t/t9001: use egrep when regular expressions are involved Supplying backslashed, extended regular expressions to grep is not portable. Use egrep instead. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
git-rev-parse.txt: Add more examples for caret and colon Several items in the caret, colon and friends section contain examples already. Make sure they all come with examples, and that examples come early so that they serve as a visual guide, as well. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: Update draft release notes to 1.7.1.1 notes: Initialise variable to appease gcc notes: check number of parameters to "git notes copy"
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 'tr/send-email-8bit' into maint * tr/send-email-8bit: send-email: ask about and declare 8bit mails
Junio C Hamano
Merge branch 'pb/maint-perl-errmsg-no-dir' into maint * pb/maint-perl-errmsg-no-dir: Git.pm: better error message
Junio C Hamano
Merge branch 'js/maint-am-rebase-invalid-author' into maint * js/maint-am-rebase-invalid-author: am: use get_author_ident_from_commit instead of mailinfo when rebasing
Junio C Hamano
Merge branch 'jc/maint-simpler-common-prefix' into maint * jc/maint-simpler-common-prefix: common_prefix: simplify and fix scanning for prefixes
Junio C Hamano
Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maint * bd/maint-unpack-trees-parawalk-fix: unpack-trees: Make index lookahead less pessimal
Ramsay Jones
notes: Initialise variable to appease gcc gcc version 3.4.4 thinks that the 'cmp' variable could be used while uninitialised and complains thus: notes.c: In function `write_each_non_note_until': notes.c:719: warning: 'cmp' might be used uninitialized in \ this function Note that gcc versions 4.1.2 and 4.4.0 do not issue this warning. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano …
Jeff King
notes: check number of parameters to "git notes copy" Otherwise we may segfault with too few parameters. Signed-off-by: Jeff King <peff@peff.net> Tested-by: Bert Wesarg <Bert.Wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones
msvc: Select the "fast" definition of the {get,put}_be32() macros On Intel machines, the msvc compiler defines the CPU architecture macros _M_IX86 and _M_X64 (equivalent to __i386__ and __x86_64__ respectively). Use these macros in the pre-processor expression to select the "fast" definition of the {get,put}_be32() macros. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitst…
  1. Prev
  2. Next