1. 07 Mar, 2019 7 commits
    • Junio C Hamano's avatar
      Merge branch 'sc/pack-redundant' · cf0879f7
      Junio C Hamano authored
      Update the implementation of pack-redundant for performance in a
      repository with many packfiles.
      
      * sc/pack-redundant:
        pack-redundant: consistent sort method
        pack-redundant: rename pack_list.all_objects
        pack-redundant: new algorithm to find min packs
        pack-redundant: delete redundant code
        pack-redundant: delay creation of unique_objects
        t5323: test cases for git-pack-redundant
      cf0879f7
    • Junio C Hamano's avatar
      Merge branch 'du/branch-show-current' · 3710f60a
      Junio C Hamano authored
      "git branch" learned a new subcommand "--show-current".
      
      * du/branch-show-current:
        branch: introduce --show-current display option
      3710f60a
    • Junio C Hamano's avatar
      Merge branch 'dl/complete-submodule-absorbgitdirs' · 26e3ddcd
      Junio C Hamano authored
      Command-line completion (in contrib/) learned to tab-complete the
      "git submodule absorbgitdirs" subcommand.
      
      * dl/complete-submodule-absorbgitdirs:
        completion: complete git submodule absorbgitdirs
      26e3ddcd
    • Junio C Hamano's avatar
      Merge branch 'wh/author-committer-ident-config' · 4e021dc2
      Junio C Hamano authored
      Four new configuration variables {author,committer}.{name,email}
      have been introduced to override user.{name,email} in more specific
      cases.
      
      * wh/author-committer-ident-config:
        config: allow giving separate author and committer idents
      4e021dc2
    • Junio C Hamano's avatar
      Merge branch 'aw/pretty-trailers' · 42977bf5
      Junio C Hamano authored
      The %(trailers) formatter in "git log --format=..."  now allows to
      optionally pick trailers selectively by keyword, show only values,
      etc.
      
      * aw/pretty-trailers:
        pretty: add support for separator option in %(trailers)
        strbuf: separate callback for strbuf_expand:ing literals
        pretty: add support for "valueonly" option in %(trailers)
        pretty: allow showing specific trailers
        pretty: single return path in %(trailers) handling
        pretty: allow %(trailers) options with explicit value
        doc: group pretty-format.txt placeholders descriptions
      42977bf5
    • Junio C Hamano's avatar
      Merge branch 'nd/diff-parseopt' · 54b469b9
      Junio C Hamano authored
      The diff machinery, one of the oldest parts of the system, which
      long predates the parse-options API, uses fairly long and complex
      handcrafted option parser.  This is being rewritten to use the
      parse-options API.
      
      * nd/diff-parseopt:
        diff.c: convert --raw
        diff.c: convert -W|--[no-]function-context
        diff.c: convert -U|--unified
        diff.c: convert -u|-p|--patch
        diff.c: prepare to use parse_options() for parsing
        diff.h: avoid bit fields in struct diff_flags
        diff.h: keep forward struct declarations sorted
        parse-options: allow ll_callback with OPTION_CALLBACK
        parse-options: avoid magic return codes
        parse-options: stop abusing 'callback' for lowlevel callbacks
        parse-options: add OPT_BITOP()
        parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
        parse-options: add one-shot mode
        parse-options.h: remove extern on function prototypes
      54b469b9
    • Junio C Hamano's avatar
      Merge branch 'tg/checkout-no-overlay' · 7d0c1f45
      Junio C Hamano authored
      "git checkout --no-overlay" can be used to trigger a new mode of
      checking out paths out of the tree-ish, that allows paths that
      match the pathspec that are in the current index and working tree
      and are not in the tree-ish.
      
      * tg/checkout-no-overlay:
        revert "checkout: introduce checkout.overlayMode config"
        checkout: introduce checkout.overlayMode config
        checkout: introduce --{,no-}overlay option
        checkout: factor out mark_cache_entry_for_checkout function
        checkout: clarify comment
        read-cache: add invalidate parameter to remove_marked_cache_entries
        entry: support CE_WT_REMOVE flag in checkout_entry
        entry: factor out unlink_entry function
        move worktree tests to t24*
      7d0c1f45
  2. 05 Mar, 2019 1 commit
  3. 02 Mar, 2019 1 commit
  4. 01 Mar, 2019 1 commit
  5. 26 Feb, 2019 1 commit
  6. 24 Feb, 2019 5 commits
  7. 23 Feb, 2019 3 commits
  8. 22 Feb, 2019 4 commits
  9. 20 Feb, 2019 5 commits
  10. 19 Feb, 2019 12 commits