Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 26, 2011
  1. @mjg @gitster

    rev-list --count: separate count for --cherry-mark

    mjg authored gitster committed
    When --count is used with --cherry-mark, omit the patch equivalent
    commits from the count for left and right commits and print the count of
    equivalent commits separately.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 23, 2011
  1. @mjg @gitster

    revision.c: introduce --min-parents and --max-parents options

    mjg authored gitster committed
    Introduce --min-parents and --max-parents options which limit the
    revisions to those commits which have at least (or at most) that many
    commits, where negative arguments for --max-parents= denote infinity
    (i.e. no upper limit).
    
    In particular:
    
      --max-parents=1 is the same as --no-merges;
      --min-parents=2 is the same as --merges;
      --max-parents=0 shows only roots; and
      --min-parents=3 shows only octopus merges
    
    Using --min-parents=n and --max-parents=m with n>m gives you what you ask
    for (i.e. nothing) for obvious reasons, just like when you give --merges
    (show only merge commits) and --no-merges (show only non-merge commits) at
    the same time.
    
    Also, introduce --no-min-parents and --no-max-parents to do the obvious
    thing for convenience.
    
    We compute the number of parents only when we limit by that, so there
    is no performance impact when there are no limiters.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 11, 2011
  1. @mjg @gitster

    git-log: put space after commit mark

    mjg authored gitster committed
    Currently, commit marks (left, right, boundary, cherry) are output right
    before the commit sha1, which makes it difficult to copy sha1s. Sample
    output for "git log --oneline --cherry":
    
    =049c269 t6007: test rev-list --cherry
    
    Change this to
    
    = 049c269 t6007: test rev-list --cherry
    
    which matches exactly the current output of "git log --graph".
    
    Leave "git rev-list" output as is (no space) so that they do not break.
    
    Adjust "git-svn" which uses "git log --pretty=raw --boundary".
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 9, 2011
  1. @mjg @gitster

    revision.c: introduce --cherry-mark

    mjg authored gitster committed
    for marking those commits which "--cherry-pick" would drop.
    The marker for those commits is '=' because '-' denotes a boundary
    commit already, even though 'git cherry' uses it.
    
    Nonequivalent commits are denoted '+' unless '--left-right' is used.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @mjg @gitster

    rev-list/log: factor out revision mark generation

    mjg authored gitster committed
    Currently, we have identical code for generating revision marks ('<',
    '>', '-') in 5 places.
    
    Factor out the code to a single function get_revision_mark() for easier
    maintenance and extensibility.
    
    Note that the check for !!revs in graph.c (which gets removed
    effectively by this patch) is superfluous.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 22, 2011
  1. @mjg @gitster

    revlist.c: introduce --left/right-only for unsymmetric picking

    mjg authored gitster committed
    The existing "--cherry-pick" does not work with unsymmetric ranges
    (A..B) for obvious reasons.
    
    Introduce "--left-only" and "--right-only" which limit the output to
    commits on the respective sides of a symmetric range (i.e. only "<"
    resp. ">" commits as per "--left-right").
    
    This is especially useful for things like
    
        git log --cherry-pick --right-only @{u}...
    
    which is much more flexible (and descriptive) than
    
        git cherry @{u} | sed -ne 's/^+ //p'
    
    and potentially more useful than
    
        git log --cherry-pick @{u}...
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.