Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Oct 4, 2006
  1. git-rebase: Add a -v option to show a diffstat of the changes upstrea…

    Robert Shearman authored Junio C Hamano committed
    …m at the start of a rebase.
    
    Signed-off-by: Robert Shearman <rob@codeweavers.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-rebase: Use --ignore-if-in-upstream option when executing git-for…

    Robert Shearman authored Junio C Hamano committed
    …mat-patch.
    
    This reduces the number of conflicts when rebasing after a series of
    patches to the same piece of code is committed upstream.
    
    Signed-off-by: Robert Shearman <rob@codeweavers.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Sep 25, 2006
  1. Deprecate merge-recursive.py

    Junio C Hamano authored
    This renames merge-recursive written in Python to merge-recursive-old,
    and makes merge-recur as a synonym to merge-recursive.  We do not remove
    merge-recur yet, but we will remove merge-recur and merge-recursive-old
    in a few releases down the road.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Aug 13, 2006
  1. Merge branch 'master' into js/c-merge-recursive

    Junio C Hamano authored
    Adjust to hold_lock_file_for_update() change on the master.
Commits on Jul 31, 2006
  1. rebase: Make the fast-fowarding message more user-friendly by using b…

    Robert Shearman authored Junio C Hamano committed
    …ranch names instead of SHA1 IDs.
    
    Signed-off-by: Robert Shearman <rob@codeweavers.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. rebase: Fix the detection of fast-forwarding of the current branch to…

    Robert Shearman authored Junio C Hamano committed
    … upstream.
    
    Previously, a rebasing operation with on a branch that is just tracking
    an upstream branch would output a confusing "Nothing to do" due to no
    patches being given to git-am.
    
    The test brings the behaviour back into line with that of just before
    e646c9c.
    
    Signed-off-by: Robert Shearman <rob@codeweavers.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Merge branch 'js/read-tree' into js/c-merge-recursive

    Junio C Hamano authored
    * js/read-tree: (107 commits)
      read-tree: move merge functions to the library
      read-trees: refactor the unpack_trees() part
      tar-tree: illustrate an obscure feature better
      git.c: allow alias expansion without a git directory
      setup_git_directory_gently: do not barf when GIT_DIR is given.
      Build on Debian GNU/kFreeBSD
      Call setup_git_directory() much earlier
      Call setup_git_directory() early
      Display an error from update-ref if target ref name is invalid.
      Fix http-fetch
      t4103: fix binary patch application test.
      git-apply -R: binary patches are irreversible for now.
      Teach git-apply about '-R'
      Makefile: ssh-pull.o depends on ssh-fetch.c
      log and diff family: honor config even from subdirectories
      git-reset: detect update-ref error and report it.
      lost-found: use fsck-objects --full
      Teach git-http-fetch the --stdin switch
      Teach git-local-fetch the --stdin switch
      Make pull() support fetching multiple targets at once
      ...
Commits on Jul 14, 2006
  1. recur vs recursive: help testing without touching too many stuff.

    Junio C Hamano authored
    During git-merge-recur development, you could set an environment
    variable GIT_USE_RECUR_FOR_RECURSIVE to use WIP recur in place
    of the recursive strategy.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. @dscho

    Status update on merge-recursive in C

    dscho authored Junio C Hamano committed
    This is just an update for people being interested. Alex and me were
    busy with that project for a few days now. While it has progressed nicely,
    there are quite a couple TODOs in merge-recursive.c, just search for "TODO".
    
    For impatient people: yes, it passes all the tests, and yes, according
    to the evil test Alex did, it is faster than the Python script.
    
    But no, it is not yet finished. Biggest points are:
    
    - there are still three external calls
    - in the end, it should not be necessary to write the index more than once
      (just before exiting)
    - a lot of things can be refactored to make the code easier and shorter
    
    BTW we cannot just plug in git-merge-tree yet, because git-merge-tree
    does not handle renames at all.
    
    This patch is meant for testing, and as such,
    
    - it compile the program to git-merge-recur
    - it adjusts the scripts and tests to use git-merge-recur instead of
      git-merge-recursive
    - it provides "TEST", a script to execute the tests regarding -recursive
    - it inlines the changes to read-cache.c (read_cache_from(), discard_cache()
      and refresh_cache_entry())
    
    Brought to you by Alex Riesen and Dscho
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. @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 Jul 8, 2006
  1. Using 'perl' in *.sh

    Michal Rokos authored Junio C Hamano committed
    Some GIT's shell script are using bare 'perl' for perl invocation.
    Use @@PERL@@ symbol and replace it with PERL_PATH_SQ everywhere.
    
    Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jun 28, 2006
  1. rebase: check for errors from git-commit

    Eric Wong authored Junio C Hamano committed
    commit does not always succeed, so we'll have to check for
    it in the absence of set -e.  This fixes a regression
    introduced in 9e4bc7d
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. rebase: get rid of outdated MRESOLVEMSG

    Eric Wong authored Junio C Hamano committed
    There was a time when rebase --skip didn't work when used with
    --merge, but that is no more so we don't need that message
    anymore.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jun 27, 2006
  1. @dstosberg

    Fix expr usage for FreeBSD

    dstosberg authored Junio C Hamano committed
    Some implementations of "expr" (e.g. FreeBSD's) fail, if an
    argument starts with a dash.
    
    Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jun 25, 2006
  1. rebase: allow --skip to work with --merge

    Eric Wong authored Junio C Hamano committed
    Now that we control the merge base selection, we won't be forced
    into rolling things in that we wanted to skip beforehand.
    
    Also, add a test to ensure this all works as intended.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. rebase: cleanup rebasing with --merge

    Eric Wong authored Junio C Hamano committed
    We no longer have to recommit each patch to remove the parent
    information we're rebasing since we're using the low-level merge
    strategies directly instead of git-merge.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. rebase: allow --merge option to handle patches merged upstream

    Eric Wong authored Junio C Hamano committed
    Enhance t3401-rebase-partial to test with --merge as well as
    the standard am -3 strategy.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jun 22, 2006
  1. rebase --merge: fix for rebasing more than 7 commits.

    Junio C Hamano authored
    Instead of using 4-digit numbers to name commits being rebased,
    just use "cmt.$msgnum" string, with $msgnum as a decimal number
    without leading zero padding.  This makes it possible to rebase
    more than 9999 commits, but of more practical importance is that
    the earlier code used "printf" to format already formatted
    $msgnum and barfed when it counted up to 0008.  In other words,
    the old code was incapable of rebasing more than 7 commits, and
    this fixes that problem.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jun 21, 2006
  1. rebase: error out for NO_PYTHON if they use recursive merge

    Eric Wong authored Junio C Hamano committed
    recursive merge relies on Python, and we can't perform
    rename-aware merges without the recursive merge.  So bail out
    before trying it.
    
    The test won't work w/o recursive merge, either, so skip that,
    too.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. rebase: Allow merge strategies to be used when rebasing

    Eric Wong authored Junio C Hamano committed
    This solves the problem of rebasing local commits against an
    upstream that has renamed files.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 21, 2006
  1. git-rebase: use canonical A..B syntax to format-patch

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 14, 2006
  1. @loops

    Make git rebase interactive help match documentation.

    loops authored Junio C Hamano committed
    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 27, 2006
  1. @loops

    Add --continue and --abort options to git-rebase.

    loops authored Junio C Hamano committed
      git rebase [--onto <newbase>] <upstream> [<branch>]
      git rebase --continue
      git rebase --abort
    
    Add "--continue" to restart the rebase process after
    manually resolving conflicts.  The user is warned if
    there are still differences between the index and the
    working files.
    
    Add "--abort" to restore the original branch, and
    remove the .dotest working files.
    
    Some minor additions to the git-rebase documentation.
    
    [jc: fix that applies to the maintenance track has been dealt
     with separately.]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 26, 2006
  1. rebase: typofix.

    Junio C Hamano authored
    Noticed by Sean.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 13, 2006
  1. Shell utilities: Guard against expr' magic tokens.

    Mark Wooding authored Junio C Hamano committed
    Some words, e.g., `match', are special to expr(1), and cause strange
    parsing effects.  Track down all uses of expr and mangle the arguments
    so that this isn't a problem.
    
    Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 22, 2006
  1. Fix typo in git-rebase.sh.

    Jason Riedy authored Junio C Hamano committed
    s/upsteram/upstream in git-rebase.sh.
    
    Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. @cworth-gh

    git-rebase: Clarify usage statement and copy it into the actual docum…

    cworth-gh authored Junio C Hamano committed
    …entation.
    
    I found a paper thin man page for git-rebase, but was quite happy to
    see something much more useful in the usage statement of the script
    when I went there to find out how this thing worked. Here it is
    cleaned up slightly and expanded a bit into the actual documentation.
    
    Signed-off-by: Carl Worth <cworth@cworth.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 18, 2006
  1. Merge branch 'jc/rebase-limit'

    Junio C Hamano authored
    * jc/rebase-limit:
      rebase: allow rebasing onto different base.
Commits on Feb 15, 2006
  1. rebase: allow rebasing onto different base.

    Junio C Hamano authored
    This allows you to rewrite history a bit more flexibly, by
    separating the other branch name and new branch point.  By
    default, the new branch point is the same as the tip of the
    other branch as before, but you can specify where you graft the
    rebased branch onto.
    
    When you have this ancestry graph:
    
              A---B---C topic
             /
        D---E---F---G master
    
    	$ git rebase --onto master~1 master topic
    
    would rewrite the history to look like this:
    
    	      A'\''--B'\''--C'\'' topic
    	     /
        D---E---F---G master
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 13, 2006
  1. rebase: allow a hook to refuse rebasing.

    Junio C Hamano authored
    This lets a hook to interfere a rebase and help prevent certain
    branches from being rebased by mistake.  A sample hook to show
    how to prevent a topic branch that has already been merged into
    publish branch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 15, 2005
  1. Bugfixes for git-rebase

    Lukas Sandström authored Junio C Hamano committed
    Fix bugs in git-rebase wrt rebasing another branch than
    the current HEAD, rebasing with a dirty working dir,
    and rebasing a proper decendant of the target branch.
    
    [jc: with a bit of hand-merging]
    
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 14, 2005
  1. rebase: do not get confused in fast-forward situation.

    Junio C Hamano authored
    When switching to another branch and rebasing it in a one-go, it
    failed to update the variable that holds the branch head, and
    did not detect fast-forward situation correctly.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-rebase: Usage string clean-up, emit usage string at incorrect inv…

    freku045@student.liu.se authored Junio C Hamano committed
    …ocation
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 28, 2005
  1. rebase: one safety net, one bugfix and one optimization.

    Junio C Hamano authored
    When a .dotest from a previously failed rebase or patch
    application exists, rebase got confused and tried to apply
    mixture of what was already there and what is being rebased.
    Check the existence of the directory and barf.
    
    It failed with an mysterious "fatal: cannot read mbox" message
    if the branch being rebased is fully in sync with the base.
    Also if the branch is a proper descendant of the base, there is
    no need to run rebase logic.  Prevent these from happening by
    checking where the merge-base is.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 25, 2005
  1. git-sh-setup: die if outside git repository.

    Junio C Hamano authored
    Now all the users of this script detect its exit status and die,
    complaining that it is outside git repository.  So move the code
    that dies from all callers to git-sh-setup script.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.