Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 18, 2007
  1. @spearce

    Merge branch 'jc/am-quiet'

    spearce authored
    * jc/am-quiet:
      git-am: fix typo in the previous one.
      git-am: make the output quieter.
Commits on Jan 10, 2007
  1. @spearce

    Disallow working directory commands in a bare repository.

    spearce authored Junio C Hamano committed
    If the user tries to run a porcelainish command which requires
    a working directory in a bare repository they may get unexpected
    results which are difficult to predict and may differ from command
    to command.
    
    Instead we should detect that the current repository is a bare
    repository and refuse to run the command there, as there is no
    working directory associated with it.
    
    [jc: updated Shawn's original somewhat -- bugs are mine.]
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 29, 2006
  1. @spearce

    Use merge-recursive in git-am -3.

    spearce authored Junio C Hamano committed
    By switching from merge-resolve to merge-recursive in the 3-way
    fallback behavior of git-am we gain a few benefits:
    
     * renames are automatically handled, like in rebase -m;
     * conflict hunks can reference the patch name;
     * its faster on Cygwin (less forks).
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 28, 2006
  1. @spearce

    Use GIT_REFLOG_ACTION environment variable instead.

    spearce authored Junio C Hamano committed
    Junio rightly pointed out that the --reflog-action parameter
    was starting to get out of control, as most porcelain code
    needed to hand it to other porcelain and plumbing alike to
    ensure the reflog contained the top-level user action and
    not the lower-level actions it invoked.
    
    At Junio's suggestion we are introducing the new set_reflog_action
    function to all shell scripts, allowing them to declare early on
    what their default reflog name should be, but this setting only
    takes effect if the caller has not already set the GIT_REFLOG_ACTION
    environment variable.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 22, 2006
  1. @spearce

    Suggest 'add' in am/revert/cherry-pick.

    spearce authored Junio C Hamano committed
    Now that we have decided to make 'add' behave like 'update-index'
    (and therefore fully classify update-index as strictly plumbing)
    the am/revert/cherry-pick family of commands should not steer the
    user towards update-index.  Instead send them to the command they
    probably already know, 'add'.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jul 14, 2006
  1. @spearce

    Record rebase changes as 'rebase' in the reflog.

    spearce authored Junio C Hamano committed
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 19, 2006
  1. @spearce

    Include ref log detail in commit, reset, etc.

    spearce authored Junio C Hamano committed
    When updating a ref at the direction of the user include a reason why
    head was changed as part of the ref log (assuming it was enabled).
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.