summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 11:27:24 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 11:27:24 -0800
commit340c54ae5531ab08022c77cf4a12beb2c420bc24 (patch)
tree29fd11581603b5bd43e90956ace4bb767cfebf51 /Documentation/git-merge-tree.txt
parentMerge branch 'jk/git-prompt' (diff)
parentcompat/setenv.c: error if name contains '=' (diff)
downloadtgif-340c54ae5531ab08022c77cf4a12beb2c420bc24.tar.xz
Merge branch 'ef/setenv-putenv'
* ef/setenv-putenv: compat/setenv.c: error if name contains '=' compat/setenv.c: update errno when erroring out
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions