Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 1, 2015
  1. @gitster

    Sync with master

    gitster authored
    * master:
      Ninth batch for 2.6
  2. @gitster

    Merge branch 'sb/read-cache-one-indent-style-fix' into next

    gitster authored
    * sb/read-cache-one-indent-style-fix:
      read-cache: fix indentation in read_index_from
  3. @gitster

    Merge branch 'ee/clean-test-fixes' into next

    gitster authored
    * ee/clean-test-fixes:
      t7300: fix broken && chains
  4. @gitster

    Merge branch 'cc/trailers-corner-case-fix' into next

    gitster authored
    The "interpret-trailers" helper mistook a multi-paragraph title of
    a commit log message with a colon in it as the end of the trailer
    block.
    
    * cc/trailers-corner-case-fix:
      trailer: support multiline title
  5. @gitster

    Merge branch 'ld/p4-import-labels' into next

    gitster authored
    * ld/p4-import-labels:
      git-p4: fix P4 label import for unprocessed commits
      git-p4: do not terminate creating tag for unknown commit
      git-p4: failing test for ignoring invalid p4 labels
  6. @gitster

    Merge branch 'ad/bisect-terms' into next

    gitster authored
    The use of 'good/bad' in "git bisect" made it confusing to use when
    hunting for a state change that is not a regression (e.g. bugfix).
    The command learned 'old/new' and then allows the end user to
    say e.g. "bisect start --term-old=fast --term=new=slow" to find a
    performance regression.
    
    Michael's idea to make 'good/bad' more intelligent does have
    certain attractiveness ($gname/272867), and makes some of the work
    on this topic a moot point.
    
    * ad/bisect-terms:
      bisect: allow setting any user-specified in 'git bisect start'
      bisect: add 'git bisect terms' to view the current terms
      bisect: add the terms old/new
      bisect: sanity check on terms
  7. @gitster

    Merge branch 'jk/log-missing-default-HEAD' into next

    gitster authored
    "git init empty && git -C empty log" said "bad default revision 'HEAD'",
    which was found to be a bit confusing to new users.
    
    * jk/log-missing-default-HEAD:
      log: diagnose empty HEAD more clearly
  8. @gitster

    Ninth batch for 2.6

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @gitster

    Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-…

    gitster authored
    …tree-update'
    
    When re-priming the cache-tree opportunistically while committing
    the in-core index as-is, we mistakenly invalidated the in-core
    index too aggressively, causing the experimental split-index code
    to unnecessarily rewrite the on-disk index file(s).
    
    * dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update:
      commit: don't rewrite shared index unnecessarily
  10. @gitster

    Merge branch 'rt/remove-hold-lockfile-for-append'

    gitster authored
    * rt/remove-hold-lockfile-for-append:
      lockfile: remove function "hold_lock_file_for_append"
  11. @gitster

    Merge branch 'rs/archive-zip-many'

    gitster authored
    "git archive" did not use zip64 extension when creating an archive
    with more than 64k entries, which nobody should need, right ;-)?
    
    * rs/archive-zip-many:
      archive-zip: support more than 65535 entries
      archive-zip: use a local variable to store the creator version
      t5004: test ZIP archives with many entries
  12. @gitster

    Merge branch 'ls/p4-fold-case-client-specs'

    gitster authored
    On case insensitive systems, "git p4" did not work well with client
    specs.
    
    * ls/p4-fold-case-client-specs:
      git-p4: honor core.ignorecase when using P4 client specs
  13. @gitster

    Merge branch 'ah/submodule-typofix-in-error'

    gitster authored
    Error string fix.
    
    * ah/submodule-typofix-in-error:
      git-submodule: remove extraneous space from error message
  14. @gitster

    Merge branch 'ah/reflog-typofix-in-error'

    gitster authored
    Error string fix.
    
    * ah/reflog-typofix-in-error:
      reflog: add missing single quote to error message
  15. @gitster

    Merge branch 'ah/read-tree-usage-string'

    gitster authored
    Usage string fix.
    
    * ah/read-tree-usage-string:
      read-tree: replace bracket set with parentheses to clarify usage
  16. @gitster

    Merge branch 'ah/pack-objects-usage-strings'

    gitster authored
    Usage string fix.
    
    * ah/pack-objects-usage-strings:
      pack-objects: place angle brackets around placeholders in usage strings
  17. @gitster

    Merge branch 'br/svn-doc-include-paths-config'

    gitster authored
    * br/svn-doc-include-paths-config:
      git-svn doc: mention "svn-remote.<name>.include-paths"
  18. @gitster

    Merge branch 'nd/fixup-linked-gitdir'

    gitster authored
    The code in "multiple-worktree" support that attempted to recover
    from an inconsistent state updated an incorrect file.
    
    * nd/fixup-linked-gitdir:
      setup: update the right file in multiple checkouts
Commits on Aug 31, 2015
  1. @gitster

    Sync with master

    gitster authored
    * master:
      Eighth batch for 2.6
  2. @gitster

    Merge branch 'br/svn-doc-include-paths-config' into next

    gitster authored
    * br/svn-doc-include-paths-config:
      git-svn doc: mention "svn-remote.<name>.include-paths"
  3. @gitster

    Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-…

    gitster authored
    …tree-update' into next
    
    When re-priming the cache-tree opportunistically while committing
    the in-core index as-is, we mistakenly invalidated the in-core
    index too aggressively, causing the experimental split-index code
    to unnecessarily rewrite the on-disk index file(s).
    
    * dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update:
      commit: don't rewrite shared index unnecessarily
  4. @gitster

    Merge branch 'ah/read-tree-usage-string' into next

    gitster authored
    Usage string fix.
    
    * ah/read-tree-usage-string:
      read-tree: replace bracket set with parentheses to clarify usage
  5. @gitster

    Merge branch 'ah/pack-objects-usage-strings' into next

    gitster authored
    Usage string fix.
    
    * ah/pack-objects-usage-strings:
      pack-objects: place angle brackets around placeholders in usage strings
  6. @gitster

    Merge branch 'ah/submodule-typofix-in-error' into next

    gitster authored
    Error string fix.
    
    * ah/submodule-typofix-in-error:
      git-submodule: remove extraneous space from error message
  7. @gitster

    Merge branch 'rt/remove-hold-lockfile-for-append' into next

    gitster authored
    * rt/remove-hold-lockfile-for-append:
      lockfile: remove function "hold_lock_file_for_append"
  8. @gitster

    Merge branch 'ls/p4-fold-case-client-specs' into next

    gitster authored
    On case insensitive systems, "git p4" did not work well with client
    specs.
    
    * ls/p4-fold-case-client-specs:
      git-p4: honor core.ignorecase when using P4 client specs
  9. @gitster

    Merge branch 'ah/reflog-typofix-in-error' into next

    gitster authored
    Error string fix.
    
    * ah/reflog-typofix-in-error:
      reflog: add missing single quote to error message
  10. @gitster

    Merge branch 'rs/archive-zip-many' into next

    gitster authored
    "git archive" did not use zip64 extension when creating an archive
    with more than 64k entries, which nobody should need, right ;-)?
    
    * rs/archive-zip-many:
      archive-zip: support more than 65535 entries
      archive-zip: use a local variable to store the creator version
      t5004: test ZIP archives with many entries
  11. @gitster

    Eighth batch for 2.6

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @gitster

    Merge branch 'sg/describe-contains'

    gitster authored
    "git describe" without argument defaulted to describe the HEAD
    commit, but "git describe --contains" didn't.  Arguably, in a
    repository used for active development, such defaulting would not
    be very useful as the tip of branch is typically not tagged, but it
    is better to be consistent.
    
    * sg/describe-contains:
      describe --contains: default to HEAD when no commit-ish is given
  13. @gitster

    Merge branch 'db/push-sign-if-asked'

    gitster authored
    The client side codepaths in "git push" have been cleaned up
    and the user can request to perform an optional "signed push",
    i.e. sign only when the other end accepts signed push.
    
    * db/push-sign-if-asked:
      push: add a config option push.gpgSign for default signed pushes
      push: support signing pushes iff the server supports it
      builtin/send-pack.c: use parse_options API
      config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_bool
      transport: remove git_transport_options.push_cert
      gitremote-helpers.txt: document pushcert option
      Documentation/git-send-pack.txt: document --signed
      Documentation/git-send-pack.txt: wrap long synopsis line
      Documentation/git-push.txt: document when --signed may fail
  14. @gitster

    Merge branch 'jk/notes-merge-config'

    gitster authored
    "git notes merge" can be told with "--strategy=<how>" option how to
    automatically handle conflicts; this can now be configured by
    setting notes.mergeStrategy configuration variable.
    
    * jk/notes-merge-config:
      notes: teach git-notes about notes.<name>.mergeStrategy option
      notes: add notes.mergeStrategy option to select default strategy
      notes: add tests for --commit/--abort/--strategy exclusivity
      notes: extract parse_notes_merge_strategy to notes-utils
      notes: extract enum notes_merge_strategy to notes-utils.h
      notes: document cat_sort_uniq rewriteMode
  15. @gitster

    Merge branch 'jc/am-state-fix'

    gitster authored
    Recent reimplementation of "git am" changed the format of state
    files kept in $GIT_DIR/rebase-apply/ without meaning to do so,
    primarily because write_file() API was cumbersome to use and it was
    easy to mistakenly make text files with incomplete lines.  Update
    write_file() interface to make it harder to misuse.
    
    * jc/am-state-fix:
      write_file(): drop caller-supplied LF from calls to create a one-liner file
      write_file_v(): do not leave incomplete line at the end
      write_file(): drop "fatal" parameter
      builtin/am: make sure state files are text
      builtin/am: introduce write_state_*() helper functions
  16. @gitster

    Merge branch 'jc/log-p-cc'

    gitster authored
    "git log --cc" did not show any patch, even though most of the time
    the user meant "git log --cc -p -m" to see patch output for commits
    with a single parent, and combined diff for merge commits.  The
    command is taught to DWIM "--cc" (without "--raw" and other forms
    of output specification) to "--cc -p -m".
    
    * jc/log-p-cc:
      builtin/log.c: minor reformat
      log: show merge commit when --cc is given
      log: when --cc is given, default to -p unless told otherwise
      log: rename "tweak" helpers
  17. @gitster

    Merge branch 'jk/fix-alias-pager-config-key-warnings'

    gitster authored
    Because the configuration system does not allow "alias.0foo" and
    "pager.0foo" as the configuration key, the user cannot use '0foo'
    as a custom command name anyway, but "git 0foo" tried to look these
    keys up and emitted useless warnings before saying '0foo is not a
    git command'.  These warning messages have been squelched.
    
    * jk/fix-alias-pager-config-key-warnings:
      config: silence warnings for command names with invalid keys
Something went wrong with that request. Please try again.