Skip to content
Commits on Oct 10, 2012
  1. Merge branch 'rr/git-uri-doc'

    committed
    * rr/git-uri-doc:
      Git url doc: mark ftp/ftps as read-only and deprecate them
  2. Merge branch 'nd/doc-ignore'

    committed
    * nd/doc-ignore:
      gitignore.txt: suggestions how to get literal # or ! at the beginning
  3. Merge branch 'jc/doc-long-options'

    committed
    * jc/doc-long-options:
      gitcli: parse-options lets you omit tail of long options
  4. Sync with maint

    committed
    * maint:
      attr: a note about the order of .gitattributes lookup
  5. @pclouds

    attr: a note about the order of .gitattributes lookup

    pclouds committed with
    This is the documentation part of
    
    1a9d7e9 (attr.c: read .gitattributes from index as well. - 2007-08-14)
    06f33c1 (Read attributes from the index that is being checked out - 2009-03-13)
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 8, 2012
  1. @artagnon

    Git url doc: mark ftp/ftps as read-only and deprecate them

    artagnon committed with
    It is not even worth mentioning their removal; just discourage
    people from using them.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Git 1.8.0-rc1

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Sync with 1.7.12.3

    committed
  4. Git 1.7.12.3

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Merge branch 'rt/maint-clone-single' into maint

    committed
    A repository created with "git clone --single" had its fetch
    refspecs set up just like a clone without "--single", leading the
    subsequent "git fetch" to slurp all the other branches, defeating
    the whole point of specifying "only this branch".
    
    * rt/maint-clone-single:
      clone --single: limit the fetch refspec to fetched branch
  6. Merge branch 'jc/blame-follows-renames' into maint

    committed
    It was unclear in the documentation for "git blame" that it is
    unnecessary for users to use the "--follow" option.
    
    * jc/blame-follows-renames:
      git blame: document that it always follows origin across whole-file renames
Commits on Oct 7, 2012
  1. @pclouds

    gitignore.txt: suggestions how to get literal # or ! at the beginning

    pclouds committed with
    We support backslash escape, but we hide the details behind the phrase
    "a shell glob suitable for consumption by fnmatch(3)". So it may not
    be obvious how one can get literal # or ! at the beginning of pattern.
    Add a few lines on how to work around the magic characters.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 5, 2012
  1. gitcli: parse-options lets you omit tail of long options

    committed
    Describe the behaviour, but do warn people against taking it too
    literally and expect an abbreviation valid today will stay valid
    forever.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 3, 2012
  1. Update draft release notes to 1.8.0

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'nd/grep-reflog'

    committed
    Teach the commands from the "log" family the "--grep-reflog" option
    to limit output by string that appears in the reflog entry when the
    "--walk-reflogs" option is in effect.
    
    * nd/grep-reflog:
      revision: make --grep search in notes too if shown
      log --grep-reflog: reject the option without -g
      revision: add --grep-reflog to filter commits by reflog messages
      grep: prepare for new header field filter
Commits on Oct 2, 2012
  1. Merge branch 'maint'

    committed
  2. Start preparing for 1.7.12.3

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'rr/maint-submodule-unknown-cmd' into maint

    committed
    "git submodule frotz" was not diagnosed as "frotz" being an unknown
    subcommand to "git submodule"; the user instead got a complaint that
    "git submodule status" was run with an unknown path "frotz".
    
    * rr/maint-submodule-unknown-cmd:
      submodule: if $command was not matched, don't parse other args
  4. @artagnon

    Documentation: mention `push.default` in git-push.txt

    artagnon committed with
    It already is listed in the "git config" documentation, but people
    interested in pushing would first look at "git push" documentation.
    
    Noticed-by: David Glasser
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
    Fixed-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @mjg

    RelNotes/1.8.0: various typo and style fixes

    mjg committed with
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 1, 2012
  1. Git 1.8.0-rc0

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/blame-follows-renames'

    committed
    Clarify the "blame" documentation to tell the users that there is
    no need to ask for "--follow".
    
    * jc/blame-follows-renames:
      git blame: document that it always follows origin across whole-file renames
  3. Merge branch 'rt/maint-clone-single'

    committed
    Running "git fetch" in a repository made with "git clone --single"
    slurps all the branches, defeating the point of "--single".
    
    * rt/maint-clone-single:
      clone --single: limit the fetch refspec to fetched branch
Commits on Sep 30, 2012
  1. Update draft release notes to 1.8.0

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Sync with 1.7.12.2

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Git 1.7.12.2

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'jc/maint-log-grep-all-match-1' into maint

    committed
    * jc/maint-log-grep-all-match-1:
      grep.c: make two symbols really file-scope static this time
      t7810-grep: test --all-match with multiple --grep and --author options
      t7810-grep: test interaction of multiple --grep and --author options
      t7810-grep: test multiple --author with --all-match
      t7810-grep: test multiple --grep with and without --all-match
      t7810-grep: bring log --grep tests in common form
      grep.c: mark private file-scope symbols as static
      log: document use of multiple commit limiting options
      log --grep/--author: honor --all-match honored for multiple --grep patterns
      grep: show --debug output only once
      grep: teach --debug option to dump the parse tree
  5. Merge branch 'rr/maint-submodule-unknown-cmd'

    committed
    * rr/maint-submodule-unknown-cmd:
      submodule: if $command was not matched, don't parse other args
  6. Merge branch 'aw/rebase-i-edit-todo'

    committed
    Teach an option to edit the insn sheet to "git rebase -i".
    
    * aw/rebase-i-edit-todo:
      rebase -i: suggest using --edit-todo to fix an unknown instruction
      rebase -i: Add tests for "--edit-todo"
      rebase -i: Teach "--edit-todo" action
      rebase -i: Refactor help messages for todo file
      rebase usage: subcommands can not be combined with -i
Commits on Sep 29, 2012
  1. @pclouds

    revision: make --grep search in notes too if shown

    pclouds committed with
    Notes are shown after commit body. From user perspective it looks
    pretty much like commit body and they may assume --grep would search
    in that part too.
    
    Make it so.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. log --grep-reflog: reject the option without -g

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @pclouds

    revision: add --grep-reflog to filter commits by reflog messages

    pclouds committed with
    Similar to --author/--committer which filters commits by author and
    committer header fields. --grep-reflog adds a fake "reflog" header to
    commit and a grep filter to search on that line.
    
    All rules to --author/--committer apply except no timestamp stripping.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 25, 2012
  1. @artagnon

    submodule: if $command was not matched, don't parse other args

    artagnon committed with
    "git submodule" command DWIMs the command line and assumes a
    unspecified action word for 'status' action.  This is a UI mistake
    that leads to a confusing behaviour.  A mistyped command name is
    instead treated as a request for 'status' of the submodule with that
    name, e.g.
    
        $ git submodule show
        error: pathspec 'show' did not match any file(s) known to git.
        Did you forget to 'git add'?
    
    Stop DWIMming an unknown or mistyped subcommand name as pathspec
    given to unspelled "status" subcommand.  "git submodule" without any
    argument is still interpreted as "git submodule status", but its
    value is questionable.
    
    Adjust t7400 to match, and stop advertising the default subcommand
    being 'status' which does not help much in practice, other than
    promoting laziness and confusion.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Update draft release notes to 1.8.0

    committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'aj/xfuncname-ada'

    committed
    * aj/xfuncname-ada:
      Add userdiff patterns for Ada
Something went wrong with that request. Please try again.