summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Célestin Matte <celestin.matte@ensimag.fr>2013-06-14 15:50:17 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-14 09:02:16 -0700
commit1149957368ef29b6a05ad5cf93f6c62352136bcd (patch)
treea7a6a107ca1f4769860d520d6a56667e3e4083f6 /Documentation/git-merge.txt
parentgit-remote-mediawiki: remove useless regexp modifier (m) (diff)
downloadtgif-1149957368ef29b6a05ad5cf93f6c62352136bcd.tar.xz
git-remote-mediawiki: change the behaviour of a split
A "split ' '" is turned into a "split / /", which changes its behaviour: the old method matched a run of whitespaces (/\s*/), while the new one will match a single space, which is what we want here. Indeed, in other contexts, changing split(' ') to split(/ /) could potentially be a regression, however, here, when parsing the output of "rev-list --parents", whose output SHA-1's are each separated by a single space, splitting on a single space is perfectly correct. Signed-off-by: Célestin Matte <celestin.matte@ensimag.fr> Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions