summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 10:44:20 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-27 10:44:21 -0800
commit4e9f9320e3238ea32df84010dae45d01923a0de5 (patch)
tree9eae1d5218745b3ceedbebcfe0d2b9f3f0b4aeb8 /Documentation
parentf583ace15762e2f9f68ccfcf0ec0e0527b2a899d (diff)
parent9892d5d4541d93a8a6a4fd9ac4178d71d0d308e3 (diff)
downloadgit-4e9f9320e3238ea32df84010dae45d01923a0de5.tar.gz
Merge branch 'jk/interpret-branch-name-fix'
Fix a handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":". * jk/interpret-branch-name-fix: interpret_branch_name: find all possible @-marks interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: always respect "namelen" parameter interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: factor out upstream handling
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions