KEMBAR78
Comparing b4b8c35729...dcb500dc16 · git/git · GitHub
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: git/git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b4b8c35729
Choose a base ref
...
head repository: git/git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dcb500dc16
Choose a head ref
  • 5 commits
  • 11 files changed
  • 1 contributor

Commits on Jul 2, 2019

  1. sequencer: add advice for revert 

    In the case of merge conflicts, while performing a revert, we are
currently advised to use `git cherry-pick --<sequencer-options>`.
Introduce a separate advice message for `git revert`. Also change
the signature of `create_seq_dir` to handle which advice to display
selectively.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @r1walz @gitster
    r1walz authored and gitster committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    6a1f904 View commit details
    Browse the repository at this point in the history

  2. sequencer: rename reset_for_rollback to reset_merge 

    We are on a path to teach cherry-pick/revert how to skip commits. To
achieve this, we could really make use of existing functions.
reset_for_rollback is one such function, but the name does not
intuitively suggest to use it to reset a merge, which it was born to
perform, see 539047c ("revert: introduce --abort to cancel a failed
cherry-pick", 2011-11-23). Change the name to reset_merge to make
it more intuitive.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @r1walz @gitster
    r1walz authored and gitster committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    918d1e6 View commit details
    Browse the repository at this point in the history

  3. sequencer: use argv_array in reset_merge 

    Avoid using magic numbers for array size and index under `reset_merge`
function. Use `argv_array` instead. This will make code shorter and
easier to extend.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @r1walz @gitster
    r1walz authored and gitster committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    265ab48 View commit details
    Browse the repository at this point in the history

  4. cherry-pick/revert: add --skip option 

    git am or rebase have a --skip flag to skip the current commit if the
user wishes to do so. During a cherry-pick or revert a user could
likewise skip a commit, but needs to use 'git reset' (or in the case
of conflicts 'git reset --merge'), followed by 'git (cherry-pick |
revert) --continue' to skip the commit. This is more annoying and
sometimes confusing on the users' part. Add a `--skip` option to make
skipping commits easier for the user and to make the commands more
consistent.

In the next commit, we will change the advice messages hence finishing
the process of teaching revert and cherry-pick "how to skip commits".

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @r1walz @gitster
    r1walz authored and gitster committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    de81ca3 View commit details
    Browse the repository at this point in the history

  5. cherry-pick/revert: advise using --skip 

    The previous commit introduced a --skip flag for cherry-pick and
revert. Update the advice messages, to tell users about this less
cumbersome way of skipping commits. Also add tests to ensure
everything is working fine.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @r1walz @gitster
    r1walz authored and gitster committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    dcb500d View commit details
    Browse the repository at this point in the history
Loading