summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2016-09-04 22:18:28 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-07 12:29:53 -0700
commit725149beab088b1368cc01aa3f1a7845db14132d (patch)
tree51acd0365798a5e8393ddb1960cfef37ace9a2bc /Documentation/git-merge.txt
parentusage: add set_warn_routine() (diff)
downloadtgif-725149beab088b1368cc01aa3f1a7845db14132d.tar.xz
usage: add get_error_routine() and get_warn_routine()
Let's make it possible to get the current error_routine and warn_routine, so that we can store them before using set_error_routine() or set_warn_routine() to use new ones. This way we will be able put back the original routines, when we are done with using new ones. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions