1. 24 Oct, 2014 1 commit
  2. 27 Jan, 2014 1 commit
  3. 12 Feb, 2013 1 commit
  4. 16 Sep, 2012 1 commit
  5. 14 Sep, 2012 1 commit
    • Miklos Vajna's avatar
      cherry-pick: don't forget -s on failure · 5ed75e2a
      Miklos Vajna authored
      In case 'git cherry-pick -s <commit>' failed, the user had to use 'git
      commit -s' (i.e. state the -s option again), which is easy to forget
      about.  Instead, write the signed-off-by line early, so plain 'git
      commit' will have the same result.
      
      Also update 'git commit -s', so that in case there is already a relevant
      Signed-off-by line before the Conflicts: line, it won't add one more at
      the end of the message. If there is no such line, then add it before the
      the Conflicts: line.
      Signed-off-by: default avatarMiklos Vajna <vmiklos@suse.cz>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      5ed75e2a
  6. 06 Aug, 2012 1 commit
  7. 24 Apr, 2012 1 commit
    • Neil Horman (CI test user)'s avatar
      git-cherry-pick: Add keep-redundant-commits option · b27cfb0d
      Neil Horman (CI test user) authored
      The git-cherry-pick --allow-empty command by default only preserves empty
      commits that were originally empty, i.e only those commits for which
      <commit>^{tree} and <commit>^^{tree} are equal.  By default commits which are
      non-empty, but were made empty by the inclusion of a prior commit on the current
      history are filtered out.  This option allows us to override that behavior and
      include redundant commits as empty commits in the change history.
      
      Note that this patch changes the default behavior of git cherry-pick slightly.
      Prior to this patch all commits in a cherry-pick sequence were applied and git
      commit was run.  The implication here was that, if a commit was redundant, and
      the commit did not trigger the fast forward logic, the git commit operation, and
      therefore the git cherry-pick operation would fail, displaying the cherry pick
      advice (i.e. run git commit --allow-empty).  With this patch however, such
      redundant commits are automatically skipped without stopping, unless
      --keep-redundant-commits is specified, in which case, they are automatically
      applied as empty commits.
      Signed-off-by: Neil Horman (CI test user)'s avatarNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      b27cfb0d
  8. 11 Apr, 2012 1 commit
  9. 12 Jan, 2012 1 commit
    • Ramkumar Ramachandra's avatar
      sequencer: factor code out of revert builtin · 043a4492
      Ramkumar Ramachandra authored
      Expose the cherry-picking machinery through a public
      sequencer_pick_revisions() (renamed from pick_revisions() in
      builtin/revert.c), so that cherry-picking and reverting are special
      cases of a general sequencer operation.  The cherry-pick builtin is
      now a thin wrapper that does command-line argument parsing before
      calling into sequencer_pick_revisions().  In the future, we can write
      a new "foo" builtin that calls into the sequencer like:
      
        memset(&opts, 0, sizeof(opts));
        opts.action = REPLAY_FOO;
        opts.revisions = xmalloc(sizeof(*opts.revs));
        parse_args_populate_opts(argc, argv, &opts);
        init_revisions(opts.revs);
        sequencer_pick_revisions(&opts);
      
      This patch does not intend to make any functional changes.  Check
      with:
      
        $ git blame -s -C HEAD^..HEAD -- sequencer.c | grep -C3 '^[^^]'
      Signed-off-by: default avatarRamkumar Ramachandra <artagnon@gmail.com>
      Reviewed-by: default avatarJonathan Nieder <jrnieder@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      043a4492
  10. 12 Dec, 2011 1 commit
  11. 22 Nov, 2011 1 commit
    • Jonathan Nieder's avatar
      revert: rename --reset option to --quit · f80a8726
      Jonathan Nieder authored
      The option to "git cherry-pick" and "git revert" to discard the
      sequencer state introduced by v1.7.8-rc0~141^2~6 (revert: Introduce
      --reset to remove sequencer state, 2011-08-04) has a confusing name.
      Change it now, while we still have the time.
      
      The new name for "cherry-pick, please get out of my way, since I've
      long forgotten about the sequence of commits I was cherry-picking when
      you wrote that old .git/sequencer directory" is --quit.  Mnemonic:
      this is analagous to quiting a program the user is no longer using ---
      we just want to get out of the multiple-command cherry-pick procedure
      and not to reset HEAD or rewind any other old state.
      
      The "--reset" option is kept as a synonym to minimize the impact.  We
      might consider dropping it for simplicity in a separate patch, though.
      
      Adjust documentation and tests to use the newly preferred name (--quit)
      instead of --reset.  While at it, let's clarify the short descriptions
      of these operations in "-h" output.
      
      Before:
      
      	--reset		forget the current operation
      	--continue	continue the current operation
      
      After:
      
      	--quit		end revert or cherry-pick sequence
      	--continue	resume revert or cherry-pick sequence
      Noticed-by: Phil Hord's avatarPhil Hord <phil.hord@gmail.com>
      Signed-off-by: default avatarJonathan Nieder <jrnieder@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      f80a8726
  12. 04 Aug, 2011 1 commit