Skip to content
Commits on Apr 25, 2009
  1. @gitster

    GIT 1.6.3-rc2

    gitster committed Apr 24, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'maint'

    gitster committed Apr 24, 2009
    * maint:
      test-genrandom: Add newline to usage string
  3. @gitster

    Merge branch 'maint-1.6.1' into maint

    gitster committed Apr 24, 2009
    * maint-1.6.1:
      test-genrandom: Add newline to usage string
  4. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 24, 2009
    * maint-1.6.0:
      test-genrandom: Add newline to usage string
Commits on Apr 24, 2009
  1. @peff @gitster

    t7800: respect NO_PERL

    peff committed with gitster Apr 24, 2009
    Difftool is written in perl, so we don't build it if NO_PERL
    is set.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @j6t @gitster

    remote.c: do not trigger remote.<name>.<var> codepath for two-level n…

    j6t committed with gitster Apr 23, 2009
    …ames
    
    If the config file contains a section like this:
    
        [remote]
                default = foo
    
    (it should be '[remotes]') then commands like
    
        git status
        git checkout
        git branch -v
    
    fail even though they are not obviously related to remotes. (These
    commands write "ahead, behind" information and, therefore, access the
    per-remote information).
    
    Unknown configuration keys should be ignored, not trigger errors.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @j6t @gitster

    builtin-help: silently tolerate unknown keys

    j6t committed with gitster Apr 23, 2009
    If for some reason the config file contains a key without a subkey like
    
        [man]
            foo = bar
    
    then even a plain
    
        git help
    
    produces an error message. With this patch such an entry is ignored.
    
    Additionally, the warning about unknown sub-keys is removed. It could
    become annoying if new sub-keys are introduced in the future, and then
    the configuration is read by an old version of git that does not know
    about it.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @raalkml @gitster

    Explain seemingly pointless use of system in difftool

    raalkml committed with gitster Apr 23, 2009
    Portability reasons.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 23, 2009
  1. @gitster

    Makefile: ignore perl/ subdirectory under NO_PERL

    gitster committed Apr 22, 2009
    The install target still descends into perl subdirectory when NO_PERL is
    requested.  Fix this.
    
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @bebarino @gitster

    config.txt: Make configuration paragraph more consistent

    bebarino committed with gitster Apr 23, 2009
    By renaming 'information' to 'configuration' we capture more clearly
    what a configuration file holds.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @bebarino @gitster

    config.txt: clarify sentences in the configuration and syntax sections

    bebarino committed with gitster Apr 23, 2009
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @bebarino @gitster

    config.txt: add missing 'the's and make words plural

    bebarino committed with gitster Apr 23, 2009
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @bebarino @gitster

    git-format-patch.txt: general rewordings and cleanups

    bebarino committed with gitster Apr 23, 2009
    Clarify --no-binary description using some words from the original
    commit 37c22a4 (add --no-binary, 2008-05-9). Cleanup --suffix
    description. Add --thread style option to synopsis and reorganize it a
    bit. Clarify renaming patches example and the configuration paragraph.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @bebarino @gitster

    git-show-branch.txt: cleanup example description

    bebarino committed with gitster Apr 23, 2009
    Add a missing quote and properly escape the ' character so docs don't
    look odd. Add 'the' to make some sentences more gramatically correct.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @bebarino @gitster

    Documentation: use lowercase for shallow and deep threading

    bebarino committed with gitster Apr 23, 2009
    Even when a sentence is started with 'shallow' or 'deep' use the
    lowercase version to maintain consistency.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @bebarino @gitster

    config.txt: add missing format.{subjectprefix,cc,attach} variables

    bebarino committed with gitster Apr 23, 2009
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @bebarino @gitster

    test-genrandom: Add newline to usage string

    bebarino committed with gitster Apr 23, 2009
    A minor fix to place the terminal input on a new line if test-genrandom
    is run with no arguments.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. @gitster

    Merge branch 'jc/maint-read-tree-multi'

    gitster committed Apr 22, 2009
    * jc/maint-read-tree-multi:
      checkout branch: prime cache-tree fully
      read-tree -m A B: prime cache-tree from the switched-to tree
      Move prime_cache_tree() to cache-tree.c
      read-tree A B: do not corrupt cache-tree
  11. @wfp5p @gitster

    Add parsing of elm aliases to git-send-email

    wfp5p committed with gitster Apr 22, 2009
    elm stores a text file version of the aliases that is
    <alias> = <comment> = <email address>
    
    This adds the parsing of this file to git-send-email
    
    Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @gitster

    Convert to use quiet option when available

    Dan Loewenherz committed with gitster Apr 22, 2009
    A minor fix that eliminates usage of "2>/dev/null" when --quiet or
    -q has already been implemented.
    
    Signed-off-by: Dan Loewenherz <daniel.loewenherz@yale.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @mjg @gitster

    Fix more typos/spelling in comments

    mjg committed with gitster Apr 22, 2009
    A few more fixes on top of the automatic spell checker generated ones.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. @MikeRalphson @gitster

    Fix typos / spelling in comments

    MikeRalphson committed with gitster Apr 17, 2009
    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. @wjl @gitster

    Documentation: git-svn: fix a grammatical error without awkwardness

    wjl committed with gitster Apr 22, 2009
    The way the sentence is currently written, there needs to be an "its",
    but this leads to: "however the remote wildcard may be anywhere as long
    as it's its own" which is awkward to read.
    
    Instead, this patch fixes he grammar in a simpler way.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  16. @wjl @gitster

    Documentation: git-svn: fix spurious bolding that mangles the output

    wjl committed with gitster Apr 22, 2009
    Without this fix, the output looks like:
    
    "Keep in mind that the  (asterisk) wildcard of the local ref (right of
    the :) *must be the ..." -- with half the sentence spuriously bold.
    
    This fixes the problem by simply escaping asciidoc syntax as suggested
    by Jeff King <peff@peff.net>.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. @raalkml @gitster

    Wait for git diff to finish in git difftool

    raalkml committed with gitster Apr 22, 2009
    In ActivetState Perl, exec does not wait for the started program. This
    breaks difftool tests and may cause unexpected behaviour: git difftool
    has returned, but the rest of code (diff and possibly the interactive
    program are still running in the background.
    
    Acked-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. @allancaffee @gitster

    graph API: fix a bug in the rendering of octopus merges

    allancaffee committed with gitster Apr 22, 2009
    An off by one error was causing octopus merges with 3 parents to not be
    rendered correctly.  This regression was introduced by 427fc5.
    
    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  19. @allancaffee @gitster

    graph API: fix extra space during pre_commit_line state

    allancaffee committed with gitster Apr 22, 2009
    An extra space is being inserted between the "commit" column and all of
    the successive edges.  Remove this space.  This regression was
    introduced by 427fc5b.
    
    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  20. @allancaffee @gitster

    t4202-log: extend test coverage of graphing

    allancaffee committed with gitster Apr 22, 2009
    Extend this test to cover the rendering of graphs with octopus merges
    and pre_commit lines.
    
    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 21, 2009
  1. @gitster

    Revert "stat_tracking_info(): only count real commits"

    gitster committed Apr 21, 2009
    This reverts commit 19de5d6.
    It produces a misleading output to decide if a merge can fast-forward.
  2. @mjg @gitster

    test-lib.sh: Help test_create_repo() find the templates dir

    mjg committed with gitster Apr 21, 2009
    Currently, test_create_repo() expects that templates can be found below
    `pwd`/.. This assumption fails when tests are run against a git
    installed somewhere else or test_create_repo() is called from
    subdirectiories (several tests do this).
    Therefore, use $TEST_DIRECTORY as introduced in 2d84e9f and expect
    templates to be present in $TEST_DIRECTORY/.. which should be the root
    dir of the git checkout.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'mk/maint-apply-swap'

    gitster committed Apr 21, 2009
    * mk/maint-apply-swap:
      tests: make test-apply-criss-cross-rename more robust
      builtin-apply: keep information about files to be deleted
      tests: test applying criss-cross rename patch
    
    Conflicts:
    	t/t4130-apply-criss-cross-rename.sh
  4. @gitster

    Merge branch 'maint'

    gitster committed Apr 21, 2009
    * maint:
      gitcvs-migration: Link to git-cvsimport documentation
      Fix off-by-one in read_tree_recursive
  5. @marcows @gitster

    grep: don't support "grep.color"-like config options

    marcows committed with gitster Apr 21, 2009
    color.grep and color.grep.* is the official and documented way to
    highlight grep matches. Comparable options like diff.color.* and
    status.color.* exist for backward compatibility reasons only and are not
    documented any more.
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 20, 2009
  1. @MikeRalphson @gitster

    Documentation: fix typos / spelling mistakes

    MikeRalphson committed with gitster Apr 17, 2009
    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @MikeRalphson @gitster

    builtin-remote: fix typo in option description

    MikeRalphson committed with gitster Apr 17, 2009
    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.