This project is mirrored from https://github.com/git/git. Pull mirroring updated .
  1. 06 Jun, 2012 2 commits
    • Jon Seymour's avatar
      submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar · 758615e2
      Jon Seymour authored
      Currently git submodule init and git submodule sync fail with an error
      if the superproject origin URL is of the form foo but succeed if the
      superproject origin URL is of the form ./foo or ./foo/bar or foo/bar.
      
      This change makes handling of the foo case behave like the handling
      of the ./foo case and also ensures that superfluous leading and
      embedded ./'s are removed from the resulting derived URLs.
      Signed-off-by: Jon Seymour's avatarJon Seymour <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      758615e2
    • Jon Seymour's avatar
      submodule: fix sync handling of some relative superproject origin URLs · 967b2c66
      Jon Seymour authored
      When the origin URL of the superproject is itself relative, git submodule sync
      configures the remote.origin.url configuration property of the submodule
      with a path that is relative to the work tree of the superproject
      rather than the work tree of the submodule.
      
      To fix this an 'up_path' that navigates from the work tree of the submodule
      to the work tree of the superproject needs to be prepended to the URL
      otherwise calculated.
      
      Correct handling of superproject origin URLs like foo, ./foo and ./foo/bar is
      left to a subsequent patch since an additional change is required to handle
      these cases.
      
      The documentation of resolve_relative_url() is expanded to give a more thorough
      description of the function's objective.
      Signed-off-by: Jon Seymour's avatarJon Seymour <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      967b2c66
  2. 03 Jun, 2012 2 commits
  3. 17 May, 2012 7 commits
    • Junio C Hamano's avatar
      Merge git://github.com/git-l10n/git-po · 9de96815
      Junio C Hamano authored
      By Jiang Xin (3) and others
      via Jiang Xin (3) and Ralf Thielow (1)
      * git://github.com/git-l10n/git-po:
        l10n: de.po: translate 3 new messages
        l10n: zh_CN.po: translate 3 new messages
        l10n: pt_PT.po translate new messages
        l10n: Update git.pot (8 new, 4 removed messages)
        l10n: Update git.pot (3 new, 2 removed messages)
      9de96815
    • Junio C Hamano's avatar
      Merge branch 'nd/i18n-parseopt' · c0b5c62d
      Junio C Hamano authored
      Text from "git cmd --help" are getting prepared for i18n.
      
      By Nguyễn Thái Ngọc Duy
      * nd/i18n-parseopt:
        i18n: apply: mark parseopt strings for translation
        i18n: parseopt: lookup help and argument translations when showing usage
      c0b5c62d
    • Junio C Hamano's avatar
      Merge branch 'rs/xdiff-lose-emit-func' · 2e464dd5
      Junio C Hamano authored
      Simplifies the interface between the implementation of "blame" and
      underlying xdiff engine, and removes a lot of unused or unnecessary code
      from the latter.
      
      By René Scharfe (6) and Ramsay Jones (1)
      * rs/xdiff-lose-emit-func:
        builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning
        xdiff: remove unused functions
        xdiff: remove emit_func() and xdi_diff_hunks()
        blame: factor out helper for calling xdi_diff()
        blame: use hunk_func(), part 2
        blame: use hunk_func(), part 1
        xdiff: add hunk_func()
      2e464dd5
    • Junio C Hamano's avatar
      Merge branch 'fc/git-complete-helper' · 8be441ea
      Junio C Hamano authored
      By Felipe Contreras
      * fc/git-complete-helper:
        completion: add new __git_complete helper
      8be441ea
    • Junio C Hamano's avatar
      Merge branch 'ld/git-p4-tags-and-labels' · 9b994b1c
      Junio C Hamano authored
      By Luke Diamand
      * ld/git-p4-tags-and-labels:
        git p4: fix bug when enabling tag import/export via config variables
        git p4: fix bug when verbose enabled with tag export
        git p4: add test for tag import/export enabled via config
      9b994b1c
    • Jon Seymour's avatar
      git-svn: clarify the referent of dcommit's optional argument · 2b26b65f
      Jon Seymour authored
      The documentation of the dcommit subcommand is reworded to clarify that
      the optional argument refers to a git branch, not an SVN branch.
      
      The discussion of the optional argument is put into its own paragraph
      as is the guidance about using 'dcommit' in preference to 'set-tree'.
      
      The section on REBASE vs. PULL/MERGE is reworded to incorporate the
      advice to prefer 'git rebase' previously in the description of 'dcommit'.
      Signed-off-by: Jon Seymour's avatarJon Seymour <[email protected]>
      Acked-by: default avatarEric Wong <[email protected]>
      2b26b65f
    • Avishay Lavie's avatar
      git-svn: support rebase --preserve-merges · b64e1f58
      Avishay Lavie authored
      When git svn rebase is performed after an unpushed merge, the
      rebase operation follows both parents and replays both the user's
      local commits and those from the merged branch. This is usually
      not the intended behavior.
      This patch adds support for the --preserve-merges/-p flag which
      allows for a better workflow by re-applying merge commits as merges.
      
      [ew: fixed a minor syntax error]
      Signed-off-by: default avatarAvishay Lavie <[email protected]>
      Signed-off-by: default avatarEric Wong <[email protected]>
      b64e1f58
  4. 15 May, 2012 3 commits
  5. 14 May, 2012 22 commits
  6. 12 May, 2012 2 commits
  7. 11 May, 2012 2 commits