summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-28 11:42:24 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-28 11:42:24 -0800
commite8f6b51a6bcc904b8a5fed831f718c3f9ed7ef34 (patch)
tree0a87f73f957e38ac804899b2cbd67bfe0b977a3a /Documentation/git-merge-one-file.txt
parentMerge branch 'jc/advice-doc' into maint (diff)
parentcompat/setenv.c: error if name contains '=' (diff)
downloadtgif-e8f6b51a6bcc904b8a5fed831f718c3f9ed7ef34.tar.xz
Merge branch 'ef/setenv-putenv' into maint
* ef/setenv-putenv: compat/setenv.c: error if name contains '=' compat/setenv.c: update errno when erroring out
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions