summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2014-07-15 20:14:02 +0100
committerJunio C Hamano <gitster@pobox.com>2014-07-15 15:05:02 -0700
commitb6266dc88b1fcc91d084cc9c65e0b0805cf59d55 (patch)
treec514e58bfd52b3cc2f9cd08e9c1fa39f0e85cab2 /git.c
parent3d15f536a7f5215eddae20214fb8eaeeb6baaf27 (diff)
downloadgit-b6266dc88b1fcc91d084cc9c65e0b0805cf59d55.tar.gz
rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
When using `git format-patch --ignore-if-in-upstream` we are only allowed to give a single revision range. In the next commit we will want to add an additional exclusion revision in order to handle fork points correctly, so convert `git-rebase--am` to use a symmetric difference with `--cherry-pick --right-only`. This does not change the result of the format-patch invocation, just how we spell the arguments. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions