Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 10, 2007
  1. Shawn O. Pearce

    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 28, 2006
  1. Shawn O. Pearce

    Use branch names in 'git-rebase -m' conflict hunks.

    spearce authored Junio C Hamano committed
    If a three-way merge in git-rebase generates a conflict then we
    should take advantage of git-merge-recursive's ability to include
    the branch name of each side of the conflict hunk by setting the
    GITHEAD_* environment variables.
    
    In the case of rebase there aren't really two clear branches; we
    have the branch we are rebasing onto, and we have the branch we are
    currently rebasing.  Since most conflicts will be arising between
    the user's current branch and the branch they are rebasing onto
    we assume the stuff that isn't in the current commit is the "onto"
    branch and the stuff in the current commit is the "current" branch.
    
    This assumption may however come up wrong if the user resolves one
    conflict in such a way that it conflicts again on a future commit
    also being rebased.  In this case the user's prior resolution will
    appear to be in the "onto" part of the hunk.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Shawn O. Pearce

    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 Jul 14, 2006
  1. Shawn O. Pearce

    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>
Something went wrong with that request. Please try again.