summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2010-06-14 00:29:38 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-25 08:55:48 -0700
commitf873a273d1381574fd9b2f3f613c0c7e40fe3a1c (patch)
treedb19a5352dfbe8eedb42dd42fa15534ac0a5e76b /git-merge-resolve.sh
parentt3508 (cherry-pick): futureproof against unmerged files (diff)
downloadtgif-f873a273d1381574fd9b2f3f613c0c7e40fe3a1c.tar.xz
revert: accept arbitrary rev-list options
This can be useful to do something like: git rev-list --reverse master -- README | git cherry-pick -n --stdin without using xargs. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions