Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 22, 2011
  1. @jaysoffian @gitster

    Introduce CHERRY_PICK_HEAD

    jaysoffian authored gitster committed
    When a cherry-pick conflicts git advises:
    
     $ git commit -c <original commit id>
    
    to preserve the original commit message and authorship. Instead, let's
    record the original commit id in CHERRY_PICK_HEAD and advise:
    
      $ git commit -c CHERRY_PICK_HEAD
    
    A later patch teaches git to handle the '-c CHERRY_PICK_HEAD' part.
    Note that we record CHERRY_PICK_HEAD even in the case where there
    are no conflicts so that we may use it to communicate authorship to
    commit; this will then allow us to remove set_author_ident_env from
    revert.c. However, we do not record CHERRY_PICK_HEAD when --no-commit
    is used, as presumably the user intends to further edit the commit
    and possibly even cherry-pick additional commits on top.
    
    Tests and documentation contributed by Jonathan Nieder.
    
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 20, 2008
  1. @jaysoffian @gitster

    branch: optionally setup branch.*.merge from upstream local branches

    jaysoffian authored gitster committed
    "git branch" and "git checkout -b" now honor --track option even when
    the upstream branch is local.  Previously --track was silently ignored
    when forking from a local branch.  Also the command did not error out
    when --track was explicitly asked for but the forked point specified
    was not an existing branch (i.e. when there is no way to set up the
    tracking configuration), but now it correctly does.
    
    The configuration setting branch.autosetupmerge can now be set to
    "always", which is equivalent to using --track from the command line.
    Setting branch.autosetupmerge to "true" will retain the former behavior
    of only setting up branch.*.merge for remote upstream branches.
    
    Includes test cases for the new functionality.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.