summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-05-07 17:09:04 -0400
committerLibravatar Jeff King <peff@peff.net>2012-05-08 04:51:08 -0400
commitd4a6bf1fb64d904e210fbf7c5b330b06438a5bd5 (patch)
treee730861e04c858757025a81f93df92d3f10e8729 /Documentation/merge-strategies.txt
parentstatus: fix null termination with "-b" (diff)
downloadtgif-d4a6bf1fb64d904e210fbf7c5b330b06438a5bd5.tar.xz
status: respect "-b" for porcelain format
There is no reason not to, as the user has to explicitly ask for it, so we are not breaking compatibility by doing so. We can do this simply by moving the "show_branch" flag into the wt_status struct. As a bonus, this saves us from passing it explicitly, simplifying the code. Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions