summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-15 07:58:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-15 07:58:24 (GMT)
commit66bce02ec459123d07c3f0230906cc2f8e36504c (patch)
tree53a1699e3cb68ef7483c98bd28cc85e5d3c76738 /ll-merge.h
parent2949151fe9d92b2c3405f188e650d9bb7b46c663 (diff)
parentc296134d038fe6d836fe3848e0b342d920933683 (diff)
downloadgit-66bce02ec459123d07c3f0230906cc2f8e36504c.zip
git-66bce02ec459123d07c3f0230906cc2f8e36504c.tar.gz
git-66bce02ec459123d07c3f0230906cc2f8e36504c.tar.bz2
Merge branch 'ld/push-porcelain'
* ld/push-porcelain: t5516: Use test_cmp when appropriate git-push: add tests for git push --porcelain git-push: make git push --porcelain print "Done" git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode git-push: fix an advice message so it goes to stderr Conflicts: transport.c
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions