1. 29 9月, 2015 1 次提交
  2. 22 9月, 2015 5 次提交
  3. 21 9月, 2015 10 次提交
  4. 18 9月, 2015 10 次提交
  5. 17 9月, 2015 1 次提交
  6. 15 9月, 2015 12 次提交
    • J
      f4d9753a
    • J
      Merge branch 'js/maint-am-skip-performance-regression' · cf2094ca
      Junio C Hamano 提交于
      Recent versions of scripted "git am" has a performance regression in
      "git am --skip" codepath, which no longer exists in the built-in
      version on the 'master' front.  Fix the regression in the last
      scripted version that appear in 2.5.x maintenance track and older.
      
      * js/maint-am-skip-performance-regression:
        am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
      cf2094ca
    • J
      Merge branch 'ah/show-ref-usage-string' · b8367d1f
      Junio C Hamano 提交于
      Both "git show-ref -h" and "git show-ref --help" illustrated that the
      "--exclude-existing" option makes the command read list of refs
      from its standard input.  Change only the "show-ref -h" output to
      have a pair of "<>" around the placeholder that designate an input
      file, i.e. "git show-ref --exclude-existing < <ref-list>".
      
      * ah/show-ref-usage-string:
        show-ref: place angle brackets around variables in usage string
      b8367d1f
    • J
      Merge branch 'sg/help-group' · a9400b01
      Junio C Hamano 提交于
      * sg/help-group:
        Makefile: use SHELL_PATH when running generate-cmdlist.sh
      a9400b01
    • J
      Merge branch 'rt/help-strings-fix' · 153ec926
      Junio C Hamano 提交于
      * rt/help-strings-fix:
        tag, update-ref: improve description of option "create-reflog"
        pull: don't mark values for option "rebase" for translation
      153ec926
    • J
      Git 2.6-rc2 · 45733fa9
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      45733fa9
    • E
      poll: honor the timeout on Win32 · ef8b53e7
      Edward Thomson 提交于
      Ensure that when passing a pipe, the gnulib poll replacement will not
      return 0 before the timeout has passed.
      
      Not obeying the timeout (and merely returning 0) causes pathological
      behavior when preparing a packfile for a repository and taking a
      long time to do so.  If poll were to return 0 immediately, this would
      cause keep-alives to get sent as quickly as possible until the packfile
      was created.  Such deviance from the standard would cause megabytes (or
      more) of keep-alive packets to be sent.
      
      GetTickCount is used as it is efficient, stable and monotonically
      increasing.  (Neither GetSystemTime nor QueryPerformanceCounter have
      all three of these properties.)
      Signed-off-by: NEdward Thomson <ethomson@microsoft.com>
      Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ef8b53e7
    • P
      doc: show usage of branch description · 561d2b79
      Philip Oakley 提交于
      The branch description will be included in 'git format-patch
      --cover-letter' and in 'git pull-request' emails. It can also
      be used in the automatic merge message. Tell the reader.
      
      While here, clarify that the description may be a multi-line
      explanation of the purpose of the branch's patch series.
      Signed-off-by: NPhilip Oakley <philipoakley@iee.org>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      561d2b79
    • J
      Merge git://ozlabs.org/~paulus/gitk · 3f26fe76
      Junio C Hamano 提交于
      * git://ozlabs.org/~paulus/gitk:
        gitk: Accelerators for the main menu
        gitk: Adjust the menu line numbers to compensate for the new entry
        gitk: Add a "Copy commit summary" command
        gitk: Update Bulgarian translation (307t)
        gitk: Update .po files
        gitk: Update Bulgarian translation (304t)
        gitk: Use translated version of "Command line" in getcommitlines
        gitk: Make it easier to go quickly to a specific commit
        gitk: Show the current view's name in the window title
        gitk: Add mouse right-click options to copy path and branch name
        gitk: Remove mc parameter from proc show_error
        gitk: Fix error when changing colors after closing "List references" window
        gitk: Replace catch {unset foo} with unset -nocomplain foo
        gitk: Rearrange window title to be more conventional
        gitk: sv.po: Update Swedish translation (305t0f0u)
        gitk: Fix bad English grammar "Matches none Commit Info"
      3f26fe76
    • J
      Merge branch 'jk/pack-protocol-doc' · 4be6af64
      Junio C Hamano 提交于
      Streamline documentation of the pkt-line protocol.
      
      * jk/pack-protocol-doc:
        pack-protocol: clarify LF-handling in PKT-LINE()
      4be6af64
    • J
      Merge branch 'mp/t7060-diff-index-test' · 971f9ea5
      Junio C Hamano 提交于
      Fix an old test that was doing the same thing as another one.
      
      * mp/t7060-diff-index-test:
        t7060: actually test "git diff-index --cached -M"
      971f9ea5
    • J
      Merge branch 'gb/apply-comment-typofix' · e0eeba26
      Junio C Hamano 提交于
      * gb/apply-comment-typofix:
        apply: comment grammar fix
      e0eeba26
  7. 13 9月, 2015 1 次提交