summaryrefslogtreecommitdiff
path: root/Documentation/git-cherry-pick.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-09-16 13:19:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-09-26 09:39:45 -0700
commit6d9990a959c0168ab6dfe75236980f95ac512ce5 (patch)
treec57a65f019c9104414afeaffa6af931f4a20b951 /Documentation/git-cherry-pick.txt
parentmergetool: Use args as pathspec to unmerged files (diff)
downloadtgif-6d9990a959c0168ab6dfe75236980f95ac512ce5.tar.xz
mergetool: no longer need to save standard input
Earlier code wanted to run merge_file and prompt_after_failed_merge both of which wanted to read from the standard input of the entire script inside a while loop, which read from a pipe, and in order to do so, it redirected the original standard input to another file descriptor. We no longer need to do so after the previous change. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
0 files changed, 0 insertions, 0 deletions